diff options
author | Simon Howard | 2011-09-11 23:40:44 +0000 |
---|---|---|
committer | Simon Howard | 2011-09-11 23:40:44 +0000 |
commit | efd15d965dee947a04727bb62f4e2092cf28732f (patch) | |
tree | 730d99c1e88d5e3145e552ad69dec52d30026d01 /data | |
parent | 4d17ab361e90a75dc6deefd37e6eb2ba0610b386 (diff) | |
parent | 11024d8214580d63ca7a9e70a121f5ff542a2fce (diff) | |
download | chocolate-doom-efd15d965dee947a04727bb62f4e2092cf28732f.tar.gz chocolate-doom-efd15d965dee947a04727bb62f4e2092cf28732f.tar.bz2 chocolate-doom-efd15d965dee947a04727bb62f4e2092cf28732f.zip |
Merge from raven-branch.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2367
Diffstat (limited to 'data')
-rw-r--r-- | data/.gitignore | 4 | ||||
-rw-r--r-- | data/Makefile.am | 21 | ||||
-rw-r--r-- | data/README | 4 |
3 files changed, 29 insertions, 0 deletions
diff --git a/data/.gitignore b/data/.gitignore new file mode 100644 index 00000000..a76bba93 --- /dev/null +++ b/data/.gitignore @@ -0,0 +1,4 @@ +Makefile.in +Makefile +*-doom.png +*-setup.png diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 00000000..05951cb0 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,21 @@ + +EXTRA_DIST= \ + README \ + doom.ico \ + doom8.ico \ + doom.png \ + setup.ico \ + setup8.ico \ + setup.png \ + convert-icon + +iconsdir = $(prefix)/share/icons +icons_DATA = @PROGRAM_PREFIX@doom.png \ + @PROGRAM_PREFIX@setup.png + +@PROGRAM_PREFIX@doom.png : doom.png + cp $< $@ + +@PROGRAM_PREFIX@setup.png : setup.png + cp $< $@ + diff --git a/data/README b/data/README index 82fac17e..c3be61a6 100644 --- a/data/README +++ b/data/README @@ -3,6 +3,10 @@ The Chocolate Doom icon is based on an image by Chris Metcalf http://www.flickr.com/photos/laffy4k/448920776/ +Chris has kindly agreed that the Chocolate Doom icon may be used under +the GNU GPL, so the copyright status of the icon is the same as that of +the rest of the project. + The "foo8.ico" files are 8-bit depth only, while the "foo.ico" files contain full 32-bit versions, scaled to different sizes and with proper alpha masks (as well as the 8-bit versions). The 8-bit versions are |