atlante45 34cbe317fa Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming ... Conflicts: interface/src/Avatar.cpp interface/src/Webcam.cpp		2013-07-12 17:57:20 -07:00
..
external	move shared to libraries, DRY library macro, rename libs	2013-04-12 12:38:34 -07:00
src	Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming	2013-07-12 17:57:20 -07:00
CMakeLists.txt	Reverted change that would have added glm to shared library.	2013-05-22 11:23:55 -07:00