overte/assignment-client
Brad Davis c94b8b6e30 Merge branch 'master' into dk1
Conflicts:
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
2015-05-13 21:25:56 -07:00
..
src Merge branch 'master' into dk1 2015-05-13 21:25:56 -07:00
CMakeLists.txt remove metavoxels 2015-03-02 17:21:43 -08:00