[aseprite] 103/196: Merge pull request #1022 from Nsheppard01/1.0

[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 300fceec3ffd78b7c460f42397b1da145fcc10ad
Merge: 8b161da c3f32e6
Author: David Capello <davidcapello at gmail.com>
Date:   Thu Mar 24 14:46:56 2016 -0300

    Merge pull request #1022 from Nsheppard01/1.0
    
    Adding X11 and websafe color palettes

 data/palettes/web-safe-colors.gpl | 222 ++++++++++++++++++++++++++++++++++++++
 data/palettes/x11.gpl             | 141 ++++++++++++++++++++++++
 2 files changed, 363 insertions(+)

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