Chris Collins b07ed13023 Merge pull request #10184 from druiz17/snapshot-fix ... snapshot bug fixes		2017-04-11 13:00:46 -07:00
..
avatar	Add sitting animations	2017-02-27 16:38:54 -08:00
config
controllers	add foot IK targets as actions	2017-03-30 19:11:16 -07:00
fonts	fix conflict	2017-03-24 14:46:24 -07:00
html	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
icons	Fix issues; checkpoint on new ComboDialog	2017-03-31 14:56:42 -07:00
images	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
mention-sounds
meshes	Change default avatar to ball and stick avatar	2017-04-04 09:39:06 -07:00
qml	Merge pull request #10184 from druiz17/snapshot-fix	2017-04-11 13:00:46 -07:00
QtWebEngine/UIDelegates	remove old ../../qml/menus import	2017-03-25 18:37:36 -04: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