overte-lubosz/tests
Anthony J. Thibault 80dea6831c Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers
Conflicts:
	interface/src/Application.cpp
	libraries/input-plugins/src/input-plugins/SixenseManager.cpp
2015-07-20 15:18:23 -07:00
..
audio Cleanup + formatting 2015-06-30 14:12:58 -07:00
entities quiet compiler 2015-07-13 07:39:11 -07:00
jitter Cleanup + formatting 2015-06-30 14:12:58 -07:00
networking Cleanup + formatting 2015-06-30 14:12:58 -07:00
octree PR Fixes 2015-07-02 17:29:08 -07:00
physics PR Fixes 2015-07-02 17:24:03 -07:00
render-utils Fixing test code 2015-07-16 17:23:25 -07:00
shared Added unit test for shared/transform. 2015-07-09 18:53:12 -07:00
ui merge with plugins, needs testing 2015-07-16 18:47:39 -07:00
CMakeLists.txt Cleanup + formatting 2015-06-30 14:12:58 -07:00
QTestExtensions.h Cleanup + formatting 2015-06-30 14:12:58 -07:00