Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:24:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/interface
History
Brad Davis f7a2513f26 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/MyAvatar.h
	tests/ui/src/main.cpp
2015-07-30 12:55:22 -07:00
..
external The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351 2015-07-27 19:04:49 +02:00
icon
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-30 12:55:22 -07:00
ui Merge branch 'master' into plugins 2015-07-24 13:38:18 -04:00
CMakeLists.txt The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351 2015-07-27 19:04:49 +02:00
interface_en.ts
InterfaceVersion.h.in