summaryrefslogtreecommitdiff
path: root/config.nmake
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2007-02-08 18:25:45 +0000
committerUlf Lamping <ulf.lamping@web.de>2007-02-08 18:25:45 +0000
commit90a418243c2046c0785a43964de7faaab83cfd70 (patch)
treea73fc5a08efd4f825159d50058eaba0637f67b8b /config.nmake
parent74322911219429bc6e5a6b17a4bee2fa87e7df65 (diff)
downloadwireshark-90a418243c2046c0785a43964de7faaab83cfd70.tar.gz
Python V2.5 is the latest stable version. Add a comment to config.nmake (but keep the 2.4 alive for now) and update version strings in the devel guide.
If the buildbot will be updated, we could also activate the new version in config.nmake. svn path=/trunk/; revision=20750
Diffstat (limited to 'config.nmake')
-rw-r--r--config.nmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/config.nmake b/config.nmake
index 4cfd5c9a39..02ab669ee9 100644
--- a/config.nmake
+++ b/config.nmake
@@ -327,9 +327,12 @@ POD2MAN=$(SH) pod2man
POD2HTML=$(SH) pod2html
# command for native windows python (recommended)
+# both V2.4 and V2.5 should work
PYTHON="C:/python24/python.exe"
+#PYTHON="C:/python25/python.exe"
# add native python to the path (not needed if cygwin's python is used)
PATH=c:\python24;$(PATH)
+#PATH=c:\python25;$(PATH)
# command for python (cygwin's python package, not recommended)
#PYTHON=env python