Zach Fox ee9519bf1b Merge branch 'discovery_April2018' of github.com:zfox23/hifi into discovery_April2018		2018-04-16 10:12:34 -07:00
..
avatar
config
controllers	Make view/rotation control independent of touchUpdate events rate	2018-04-06 16:17:28 -03:00
fonts	Commerce: Gifts	2018-04-11 09:41:47 -07:00
html	can keyboard help page	2018-03-07 13:54:50 -08:00
icons	Merge pull request #12661 from SamGondelman/android	2018-03-23 11:08:50 -07:00
images	Android fly - Use new asset and screen position	2018-04-04 18:19:01 -03:00
mention-sounds
meshes
qml	Merge branch 'discovery_April2018' of github.com:zfox23/hifi into discovery_April2018	2018-04-16 10:12:34 -07:00
QtWebEngine/UIDelegates
serverless	add a default tutorial json for dev interface	2018-03-26 14:32:26 -07:00
shaders
snapshot/img
sounds
styles
visage