[aseprite] 91/196: Merge branch 'Nsheppard01-master'

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 472efc46d9fbc4bcb30eca01ea6d4ae6c2be4226
Merge: f51de0b 7e7590a
Author: David Capello <davidcapello at gmail.com>
Date:   Sat Mar 19 12:44:01 2016 -0300

    Merge branch 'Nsheppard01-master'

 data/palettes/a64.gpl                 |  22 +++
 data/palettes/arne-paldac.gpl         | 247 ++++++++++++++++++++++++++++++++++
 data/palettes/arne16.gpl              |   2 +-
 data/palettes/arne32.gpl              |   2 +-
 data/palettes/cg-arne.gpl             |  21 +++
 data/palettes/copper-tech.gpl         |  22 +++
 data/palettes/cpc-boy.gpl             |  38 ++++++
 data/palettes/eroge-copper.gpl        |  22 +++
 data/palettes/gameboy-color-type1.gpl |  41 ++++++
 data/palettes/jmp.gpl                 |  22 +++
 data/palettes/monokai.gpl             |  15 +++
 data/palettes/psygnork.gpl            |  22 +++
 12 files changed, 474 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git