diff options
| author | Simon Howard | 2010-01-27 19:50:30 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-01-27 19:50:30 +0000 |
| commit | 0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e (patch) | |
| tree | 483f983aacbd9907290cf61f0e3b3afb1b03f7e9 /setup/Makefile.am | |
| parent | 3cf74a97261b1a0aceb591b495b0857781918edd (diff) | |
| parent | a9e2d244a5a37fed344405e40698de2a2969c12a (diff) | |
| download | chocolate-doom-0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e.tar.gz chocolate-doom-0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e.tar.bz2 chocolate-doom-0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e.zip | |
Merge from trunk.
Subversion-branch: /branches/opl-branch
Subversion-revision: 1829
Diffstat (limited to 'setup/Makefile.am')
| -rw-r--r-- | setup/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/setup/Makefile.am b/setup/Makefile.am index 92b4e394..91c7449a 100644 --- a/setup/Makefile.am +++ b/setup/Makefile.am @@ -44,7 +44,7 @@ chocolate_setup_LDADD = \ if HAVE_PYTHON -setup_icon.c : ../data/setup.ico +setup_icon.c : ../data/setup8.ico ../data/convert-icon $^ $@ endif |