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
..
2016-03-13 16:02:33 -07:00
2014-05-09 00:30:15 -03:00
2016-03-13 15:40:56 -07:00
2016-03-13 16:02:33 -07:00
2014-05-09 00:30:15 -03:00
2014-05-09 00:30:15 -03:00
2016-03-13 16:02:33 -07:00
2014-05-09 00:30:15 -03:00
2014-05-09 00:30:15 -03:00
2014-05-09 00:30:15 -03:00
2014-05-09 00:30:15 -03:00
2016-03-13 16:02:33 -07:00
2016-03-13 16:02:33 -07:00
2014-04-17 01:38:13 -03:00
2014-04-17 01:38:13 -03:00
2016-03-13 16:02:33 -07:00
2016-03-13 16:05:13 -07:00
2014-05-09 00:30:15 -03:00
2014-08-29 13:14:13 -04:00
2016-03-13 16:02:33 -07:00
2014-05-09 00:30:15 -03:00
2015-12-01 16:10:34 -03:00
2016-03-13 16:02:33 -07:00
2016-03-13 16:15:33 -07:00
2014-05-09 00:30:15 -03:00
2014-05-09 00:30:15 -03:00
2014-05-09 00:30:15 -03:00