about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2009-10-18 03:32:45 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2009-10-18 03:32:45 +0000
commit0918b9d1386bb7fc7ea9e267c62c2f10d397d34c (patch)
treee682f2006173fa8cb9dd3a852fcb9f9c29e760e2
parentbf7b6f10af3485ee6dc9308c6650226d28a48c39 (diff)
downloadnetpbm-mirror-0918b9d1386bb7fc7ea9e267c62c2f10d397d34c.tar.gz
netpbm-mirror-0918b9d1386bb7fc7ea9e267c62c2f10d397d34c.tar.xz
netpbm-mirror-0918b9d1386bb7fc7ea9e267c62c2f10d397d34c.zip
Release 10.35.69
git-svn-id: http://svn.code.sf.net/p/netpbm/code/super_stable@1006 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--Makefile.version2
-rw-r--r--converter/ppm/ppmtompeg/noparallel.c3
-rw-r--r--doc/HISTORY4
3 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.version b/Makefile.version
index 4bb0a620..8b8531e7 100644
--- a/Makefile.version
+++ b/Makefile.version
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 35
-NETPBM_POINT_RELEASE = 68
+NETPBM_POINT_RELEASE = 69
diff --git a/converter/ppm/ppmtompeg/noparallel.c b/converter/ppm/ppmtompeg/noparallel.c
index 016e3c44..b27934fb 100644
--- a/converter/ppm/ppmtompeg/noparallel.c
+++ b/converter/ppm/ppmtompeg/noparallel.c
@@ -163,7 +163,8 @@ MasterServer(struct inputSource * const inputSourceP,
 void
 CombineServer(int          const numFrames, 
               const char * const masterHostName, 
-              int          const masterPortNum) {
+              int          const masterPortNum,
+              const char * const outputFileName) {
 
     pm_error("This version of Ppmtompeg cannot run combine server because "
              "it does not have socket capability.");
diff --git a/doc/HISTORY b/doc/HISTORY
index 0c78323f..869b0a75 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,10 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+09.10.18 BJH  Release 10.35.69
+
+              Build: fix build failure with no-network build of Ppmtompeg.
+
 09.09.18 BJH  Release 10.35.68
 
               pambayer: fix unconditional crash/failure when you aren't using