This is an automated email from the git hooks/post-receive script. thansen pushed a commit to branch master in repository aseprite.
commit 7e7590aa1b4f9be2ad072684acd31f68f841a961 Merge: f51de0b 28a0c42 Author: David Capello <[email protected]> Date: Sat Mar 19 12:30:58 2016 -0300 Merge branch 'master' of https://github.com/Nsheppard01/aseprite into Nsheppard01-master # Conflicts: # data/palettes/arne16.gpl # data/palettes/solarized.gpl 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(-) diff --cc data/palettes/arne16.gpl index a0040e8,8a40e90..f1123ec --- a/data/palettes/arne16.gpl +++ b/data/palettes/arne16.gpl @@@ -1,21 -1,21 +1,21 @@@ GIMP Palette # # by Arne Niklas Jansson - # http://androidarts.com/ + # http://androidarts.com/palette/16pal.htm # - 0 0 0 Void -157 157 157 ASH -255 255 255 BLIND -190 38 51 BLOODRED -224 111 139 PIGMEAT - 73 60 43 OLDPOOP -164 100 34 NEWPOOP -235 137 49 BLAZE -247 226 107 ZORNSKIN - 47 72 78 SHADEGREEN - 68 137 26 LEAFGREEN -163 206 39 SLIMEGREEN - 27 38 50 NIGHTBLUE - 0 87 132 SEABLUE - 49 162 242 SKYBLUE -178 220 239 CLOUDBLUE + 0 0 0 black, void +157 157 157 grey, gray, ash +255 255 255 white, blind +190 38 51 red, bloodred +224 111 139 pink, pigmeat + 73 60 43 dbrown, darkbrown, oldpoop +164 100 34 brown, newpoop +235 137 49 orange, blaze +247 226 107 yellow, zornskin + 47 72 78 green, leafgreen + 68 137 26 dgreen, darkgreen, shadegreen +163 206 39 green, lightgreen, slimegreen + 27 38 50 nblue, nightblue + 0 87 132 dblue, darkblue, seablue, oceanblue + 49 162 242 blue, skyblue +178 220 239 lblue, lightblue, cloudblue -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
