Brad Davis 155f88e267 Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/devices/OculusManager.cpp interface/src/devices/TV3DManager.cpp interface/src/devices/TV3DManager.h libraries/gpu/src/gpu/GPUConfig.h		2015-07-31 10:28:06 -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
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	fix physics-tests build errors	2015-07-28 12:24:17 -07:00
render-utils	REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend	2015-07-30 15:07:36 -07:00
shared	fix build errors for shared-tests	2015-07-28 12:05:45 -07:00
ui	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-30 12:55:22 -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