Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-24 23:35:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/interface/resources/qml/hifi
History
Brad Davis 472a3540d7 Merge remote-tracking branch 'upstream/master' into vive-ui 
Conflicts:
	scripts/system/controllers/handControllerGrab.js
2016-06-10 10:43:09 -07:00
..
dialogs Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-10 10:43:09 -07:00
models Attachment dialog 2016-01-26 21:55:40 -08:00
overlays Snapshot dialogs 2016-02-01 11:07:48 -08:00
Desktop.qml PR feedback 2016-06-07 15:33:00 -07:00
ToggleHudButton.qml PR feedback 2016-06-07 15:33:00 -07:00