Atlante45 43597ea29d Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess ... Conflicts: interface/src/Application.cpp interface/src/Menu.cpp		2015-01-19 14:18:22 -08:00
..
src	Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess	2015-01-19 14:18:22 -08:00
CMakeLists.txt	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00