Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 21:44:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/interface
History
Brad Davis ae882c8347 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/ApplicationCompositor.cpp
	interface/src/ui/overlays/LocalModelsOverlay.cpp
2015-07-16 16:37:55 -07:00
..
external
icon
resources Merge branch 'master' into plugins 2015-07-13 19:52:53 -07:00
src Merge remote-tracking branch 'upstream/master' into plugins 2015-07-16 16:37:55 -07:00
ui Merge fixes 2015-07-13 19:07:44 -07:00
CMakeLists.txt Merge remote-tracking branch 'upstream/master' into plugins 2015-07-03 06:17:35 -07:00
interface_en.ts
InterfaceConfig.h.in Working on mac compilability 2015-07-01 23:03:33 -07:00
InterfaceVersion.h.in