diff options
| author | Simon Howard | 2011-09-11 23:07:23 +0000 |
|---|---|---|
| committer | Simon Howard | 2011-09-11 23:07:23 +0000 |
| commit | 1bcdb39fd1b273941c493be9259b44c8560b5d16 (patch) | |
| tree | 33e377560894b99dc2271b79e5607d59d78e6c33 /data | |
| parent | bab992ea55ea849d606e1733f10be42488441ab7 (diff) | |
| parent | df292a6dce27e7b20faa0c829aa0c58a3693f979 (diff) | |
| download | chocolate-doom-1bcdb39fd1b273941c493be9259b44c8560b5d16.tar.gz chocolate-doom-1bcdb39fd1b273941c493be9259b44c8560b5d16.tar.bz2 chocolate-doom-1bcdb39fd1b273941c493be9259b44c8560b5d16.zip | |
Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 2365
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 4 | ||||
| -rw-r--r-- | data/README | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index dccb51a3..05951cb0 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -14,8 +14,8 @@ icons_DATA = @PROGRAM_PREFIX@doom.png \ @PROGRAM_PREFIX@setup.png @PROGRAM_PREFIX@doom.png : doom.png - cp $^ $@ + cp $< $@ @PROGRAM_PREFIX@setup.png : setup.png - cp $^ $@ + 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 |