Atlante45 f77fab2fe0 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11		2015-01-13 20:38:52 -08:00
..
resources	tweaks to descriptions	2015-01-13 16:13:18 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 11:03:14 -08:00
CMakeLists.txt	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00