Stephen Birarda d112edab64 resolve conflicts on merge with upstream master		2013-07-08 11:07:42 -07:00
..
external	move shared to libraries, DRY library macro, rename libs	2013-04-12 12:38:34 -07:00
src	resolve conflicts on merge with upstream master	2013-07-08 11:07:42 -07:00
CMakeLists.txt	Reverted change that would have added glm to shared library.	2013-05-22 11:23:55 -07:00