Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-Armored-Dragon/interface
History
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
..
external The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351 2015-07-27 19:04:49 +02:00
icon fix check for debug/release icon 2015-01-30 15:41:44 -08:00
resources Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers 2015-07-20 15:18:23 -07:00
src Merge remote-tracking branch 'upstream/master' into plugins 2015-07-31 10:28:06 -07:00
ui Merge branch 'master' into plugins 2015-07-24 13:38:18 -04:00
CMakeLists.txt Merge remote-tracking branch 'upstream/master' into plugins 2015-07-31 10:28:06 -07:00
interface_en.ts remove more references to voxels 2015-01-07 16:09:56 -08:00
InterfaceVersion.h.in