From 671f48e77e9239f12bde785d4736ebb245cfb1d8 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 29 Nov 2010 13:51:39 +0000
Subject: [PATCH] -14

---
 history.txt                                      | 16 ++++++++++++++++
 .../java/src/net/i2p/router/RouterVersion.java   |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/history.txt b/history.txt
index 57a905e8c..a2df68cb1 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,19 @@
+2010-11-29 zzz
+    * i2psnark:
+      - Don't timeout queued piece messages
+    * Logging:
+      - Use System locale and time zone for default date/time format,
+        so it matches the wrapper log time (we can't set the wrapper log time zone).
+        (existing installs must remove logger.dateFormat line
+         in logger.config to get system default format)
+      - Force RuntimeExceptions to CRIT level
+      - Don't have log() count buffer size
+    * UDP:
+      - Fix bug causing PacketPusher to loop quickly instead of sleeping
+      - Fix udp.sendCycleTime stat
+      - Fix speed values on peers.jsp
+      - Try to fix rare NPE (ticket 298)
+
 2010-11-28 zzz
     * Build: Move all dependencies to top-level build.xml,
              so each sub-build.xml is only executed once
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 7f4edb975..31c35f8c3 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 13;
+    public final static long BUILD = 14;
 
     /** for example "-test" */
     public final static String EXTRA = "";