elisa-lj11 d16ef521f4 fixed merge conflicts from Howard's webview fix		2016-08-30 15:33:59 -07:00
..
avatar
config
controllers	Merge remote-tracking branch 'upstream/master' into demo_movement	2016-08-18 13:43:54 -07:00
fonts
html
icons
images	Merge branch 'discovery' into ux-improvements	2016-08-16 12:19:43 -07:00
info
mention-sounds
meshes
qml	fixed merge conflicts from Howard's webview fix	2016-08-30 15:33:59 -07:00
QtWebEngine/UIDelegates	Fix UI elements triggered by WebViews	2016-07-21 15:13:07 -07:00
shaders	Restoring reprojection to OpenVR	2016-08-12 22:28:55 -07:00
sounds
styles
visage