Howard Stearns b8f557ca54 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration		2017-03-29 13:30:15 -07:00
..
avatar	Add sitting animations	2017-02-27 16:38:54 -08:00
config	Remove antialiasing from menus, default to on	2016-02-23 16:24:44 -08:00
controllers	Merge from Master	2017-03-23 09:54:14 -07:00
fonts	magical new glyphs	2017-03-01 13:57:03 -07:00
html	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 08:16:59 -07:00
icons	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-28 18:09:17 -07:00
images	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
mention-sounds	fixed mention sounds dir for deployment	2014-05-12 20:55:24 +02:00
meshes	include tablet fbx with interface distribution rather than get it from s3	2017-01-26 10:20:46 -08:00
qml	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration	2017-03-29 13:30:15 -07:00
QtWebEngine/UIDelegates	hide context menu on item click	2017-01-28 14:37:49 -05:00
shaders	hacking	2016-10-18 21:33:37 -07:00
sounds	put name of button-click file back	2017-01-23 13:55:11 -08:00
styles	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
visage	css and cfg filetypes are text in .gitattributes	2015-10-20 13:58:44 -07:00