Zach Fox f42255f46b Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1		2018-03-13 13:42:42 -07:00
..
avatar
config
controllers	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
fonts	lots of fun initial progress!	2018-02-22 13:56:46 -08:00
html	Fixed extra " in backup_instructions.html	2018-02-17 18:14:44 +00:00
icons	Merge remote-tracking branch 'upstream/master' into android	2018-03-05 11:48:58 -08:00
images	Android - Make the virtual pad (joystick) position fixed. Change assets.	2018-02-27 21:24:21 -03:00
mention-sounds
meshes	Merge pull request #12464 from jherico/android_dev	2018-03-01 17:22:34 -08:00
qml	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-13 13:42:42 -07:00
QtWebEngine/UIDelegates
shaders
snapshot/img
sounds
styles
visage