Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-thingvellir/interface
History
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
..
external
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 branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers 2015-07-20 15:18:23 -07:00
ui Merge fixes 2015-07-13 19:07:44 -07:00
CMakeLists.txt Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers 2015-07-20 15:18:23 -07:00
interface_en.ts
InterfaceVersion.h.in