David Capello 7e7590aa1b Merge branch 'master' of https://github.com/Nsheppard01/aseprite into Nsheppard01-master ... # Conflicts: # data/palettes/arne16.gpl # data/palettes/solarized.gpl		2016-03-19 12:30:58 -03:00
..
fonts
icons
palettes	Merge branch 'master' of https://github.com/Nsheppard01/aseprite into Nsheppard01-master	2016-03-19 12:30:58 -03:00
scripts
skins/default	Remove unused graphics from skin	2016-03-04 15:09:50 -03:00
widgets	Change Windows Modifier Name to Win for Windows and Super for Linux/BSD	2016-03-01 23:52:36 +01:00
www
convmatr.def
gui.xml	Add different selection modes to SelectTile command	2016-03-19 12:09:03 -03:00
pref.xml	Add the new ColorTintShadeTone color picker (#707)	2016-02-26 11:18:46 -03:00