Commit Graph

4 Commits

Author SHA1 Message Date
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
Nathaniel Sheppard
38b8c191a5 Update arne16.gpl
Added Arne's color names and full URL
2016-03-13 15:39:03 -07:00
David Capello
c357396994 Add color names to arne16.gpl 2015-09-25 10:16:37 -03:00
David Capello
113d0d4df9 Add pixel art palettes
From Richard 'DawnBringer' Fhager and Arne Niklas Jansson.
2014-04-17 01:38:13 -03:00