Andrew Meadows 67c3a25475 Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia ... Conflicts: interface/src/Application.cpp libraries/entities/src/EntityItem.h		2014-12-15 14:46:46 -08:00
..
src	Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia	2014-12-15 14:46:46 -08:00
CMakeLists.txt	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00