Merge branch '2.2'

jdc8 · May 11, 2012 · 942bca8 · 942bca8
2 parents de1bbab + 6019605
commit 942bca8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/zmq_nMakefiles/nMakefile → zmq_nMakefiles/Makefile b/zmq_nMakefiles/nMakefile → zmq_nMakefiles/Makefile
@@ -6,9 +6,9 @@
 #
 # Use the following commands to build and install the zmq library for 32 or 64 bit:
 #
-# % nmake /f nMakefile ZMQDIR=../../libzmq INSTALLDIR=. all32
+# % nmake ZMQDIR=../../libzmq INSTALLDIR=. all32
 #
-# % nmake /f nMakefile ZMQDIR=../../libzmq INSTALLDIR=. all64
+# % nmake ZMQDIR=../../libzmq INSTALLDIR=. all64
 #
 
 ZMQDIR = ..\..\libzmq