Ryan Huffman 444a974bd6 Merge branch 'master' of github.com:highfidelity/hifi into fix-wm-close ... Conflicts: assignment-client/src/AssignmentClient.cpp		2014-08-28 06:52:16 -07:00
..
src	Merge branch 'master' of github.com:highfidelity/hifi into fix-wm-close	2014-08-28 06:52:16 -07:00
CMakeLists.txt	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00