about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2023-11-08 19:38:23 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2023-11-08 19:38:23 +0000
commit6f49d21d435944e4206e37aba9c55283e4bd7b90 (patch)
treeb8e323a912ec0ed11d6c42835e154f9fbaa14f7c
parent921555d099b88558f4e53c883612661afff533b3 (diff)
downloadnetpbm-mirror-6f49d21d435944e4206e37aba9c55283e4bd7b90.tar.gz
netpbm-mirror-6f49d21d435944e4206e37aba9c55283e4bd7b90.tar.xz
netpbm-mirror-6f49d21d435944e4206e37aba9c55283e4bd7b90.zip
Fix pnmcat
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4780 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY3
-rw-r--r--editor/Makefile2
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index 89ed77c7..5e0b9aad 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -33,6 +33,9 @@ not yet  BJH  Release 11.05.00
               libnetpbm, programs that use color maps: fix buffer overrun
               with insanely deep images.
 
+              merge build: Fix 'pnmcat'.  Introduced in Netpbm 11.00
+              (September 2023).
+
               Build: Fix compile error on systems without 'asprintf'.
               Introduced in Netpbm 11.04 (September 2023).
 
diff --git a/editor/Makefile b/editor/Makefile
index 0027832c..5929fc71 100644
--- a/editor/Makefile
+++ b/editor/Makefile
@@ -121,5 +121,5 @@ mergecomptrylist:
 	echo "TRY(\"pnmcut\",     main_pamcut);"     >>$@
 	echo "TRY(\"pnmscale\",   main_pamscale);"   >>$@
 	echo "TRY(\"pnmcomp\",    main_pamcomp);"    >>$@
-	echo "TRY(\"pnmcat\",     main_pamcomp);"    >>$@
+	echo "TRY(\"pnmcat\",     main_pamcat);"     >>$@