about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2012-09-30 02:24:21 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2012-09-30 02:24:21 +0000
commit23fce681d65eeabc097e09989991b0d5a51ea7e8 (patch)
tree53de939a5ffe0ed6dc2ff4fdce7c4c4cd9338b65
parent6baf6a0e339a5cfc75690bfd491a4e3748a473ae (diff)
downloadnetpbm-mirror-23fce681d65eeabc097e09989991b0d5a51ea7e8.tar.gz
netpbm-mirror-23fce681d65eeabc097e09989991b0d5a51ea7e8.tar.xz
netpbm-mirror-23fce681d65eeabc097e09989991b0d5a51ea7e8.zip
Update to release 10.60.00
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1741 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY2
-rw-r--r--version.mk4
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index 80bc7b55..c451d38e 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,7 +4,7 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
-not yet  BJH  Release 10.60.00
+12.09.30 BJH  Release 10.60.00
 
               xpmtoppm: major speedup for 3-character-per pixel files,
               memory reduction for all files: use hash table instead of
diff --git a/version.mk b/version.mk
index e5238896..399e7956 100644
--- a/version.mk
+++ b/version.mk
@@ -1,4 +1,4 @@
 NETPBM_MAJOR_RELEASE = 10
-NETPBM_MINOR_RELEASE = 59
-NETPBM_POINT_RELEASE = 99
+NETPBM_MINOR_RELEASE = 60
+NETPBM_POINT_RELEASE = 0