about summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2018-11-14 23:28:08 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2018-11-14 23:28:08 +0000
commita269b17968e26a4472ef3738ab891e7c01a8642b (patch)
treec5455fb96bc88ffe4b8aa4cffb2bf10e39579bcb /doc
parent90950e75a2e9efb5bc0d31c853ea5b23c11dbd34 (diff)
downloadnetpbm-mirror-a269b17968e26a4472ef3738ab891e7c01a8642b.tar.gz
netpbm-mirror-a269b17968e26a4472ef3738ab891e7c01a8642b.tar.xz
netpbm-mirror-a269b17968e26a4472ef3738ab891e7c01a8642b.zip
Add initial Pammixmulti code from contributor
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@3431 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'doc')
-rw-r--r--doc/HISTORY5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index cb6c013f..cc00705e 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -6,6 +6,8 @@ CHANGE HISTORY
 
 not yet  BJH  Release 10.85.00
 
+              Add pammixmulti.  Thanks Scott Pakin (scott@pakin.org).
+
               pamtotga: Add -cmap16 .
     
               pamtris: Add -rgb, -grayscale.  Add w parameter to vertex
@@ -37,6 +39,9 @@ not yet  BJH  Release 10.85.00
 
               Build: fix reference to nonexistent strndup on Mac OS X 10.6.
 
+              Merge build: fix duplicate symbol 'prefabCode' in g3topbm,
+              pbmtog3.  Introduced in Netpbm 10.79 (June 2017).
+
 18.09.29 BJH  Release 10.84.00
 
               Add pamaltsat.  Thanks Anton Shepelev <anton.txt@gmail.com>.