Stephen Birarda ede32b5f1a resolve conflicts on merge with upstream master		2014-03-05 15:31:00 -08:00
..
src	remove glm so it is referenced only externally	2014-03-04 15:19:47 -08:00
CMakeLists.txt	replace deprecated qt5 macros in cmake with target_link_libraries	2014-03-04 12:41:24 -08:00