Stephen Birarda 08581b4dac Merge branch 'master' of https://github.com/highfidelity/hifi		2014-12-19 12:50:32 -08:00
..
resources	Typo	2014-12-18 16:31:19 -08:00
src	don't add the unused assignment type to DS queue	2014-12-19 12:33:26 -08:00
CMakeLists.txt	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00