diff options
author | Simon Howard | 2011-02-12 18:42:10 +0000 |
---|---|---|
committer | Simon Howard | 2011-02-12 18:42:10 +0000 |
commit | 516a7028994df6718289a7e3db4d07a45c95466b (patch) | |
tree | cf974cb4bd38b8e9d0101a41263b42b8c87e96c7 /data | |
parent | a15ba75736d15409876c1f0a44fffc99adf1c192 (diff) | |
parent | a9996b41e954d85fde5ec5188bbf6a7f4df88011 (diff) | |
download | chocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.tar.gz chocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.tar.bz2 chocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.zip |
Merge from raven-branch. FEATURE_MULTIPLAYER has been disabled
temporarily until the netgame changes on raven-branch are finished.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2259
Diffstat (limited to 'data')
-rwxr-xr-x | data/convert-icon | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/data/convert-icon b/data/convert-icon index c651bc7f..30fade20 100755 --- a/data/convert-icon +++ b/data/convert-icon @@ -1,6 +1,4 @@ -#!/usr/bin/python -# -# $Id: convert-icon 704 2006-10-18 00:51:11Z fraggle $ +#!/usr/bin/env python # # Copyright(C) 2005 Simon Howard # @@ -29,7 +27,7 @@ import re try: import Image except ImportError: - print "WARNING: Could not update %s. Please install the Python Imaging library." % sys.argv[2] + print("WARNING: Could not update %s. Please install the Python Imaging library." % sys.argv[2]) sys.exit(0) @@ -71,4 +69,3 @@ def convert_image(filename, output_filename): convert_image(sys.argv[1], sys.argv[2]) - |