Stephen Birarda 08581b4dac Merge branch 'master' of https://github.com/highfidelity/hifi		2014-12-19 12:50:32 -08:00
..
src	fix for coding standard compliance	2014-12-19 12:19:49 -08:00
CMakeLists.txt	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00