Seiji Emery 29dcdefd26 Merge branch 'master' of https://github.com/highfidelity/hifi into gputest ... Conflicts: cmake/modules/Find3DConnexionClient.cmake interface/external/connexionclient/readme.txt interface/src/devices/3DConnexionClient.cpp interface/src/devices/3DConnexionClient.h		2015-08-05 12:45:00 -07:00
..
animation	Update test case initialization post cauterization changes.	2015-07-29 09:55:46 -07:00
audio	Cleanup + formatting	2015-06-30 14:12:58 -07:00
entities	cleanup some warnings	2015-07-15 11:20:55 -07:00
gpu-test	use geometry cache	2015-08-05 12:35:52 -07:00
jitter	Cleanup + formatting	2015-06-30 14:12:58 -07:00
networking	Add packet tests	2015-07-15 15:02:08 -07:00
octree	PR Fixes	2015-07-02 17:29:08 -07:00
physics	remove legacy shapes	2015-07-29 09:02:24 -07:00
render-utils	Core profile shader work and test code	2015-08-01 14:43:52 -07:00
shaders	adding the rest of the shaders to shaders-test	2015-08-03 12:08:14 -07:00
shared	merge rig into cleanup (removal of legacy shapes)	2015-07-31 13:40:51 -07:00
ui	Integrate glew	2015-08-01 20:08:19 -07:00
CMakeLists.txt	Cleanup + formatting	2015-06-30 14:12:58 -07:00
QTestExtensions.h	Add COMPARE_DATA to QTestExtensions	2015-07-15 15:01:56 -07:00