From ea4606fe799df3640213d8de4c4f9d961cb20ccc Mon Sep 17 00:00:00 2001
From: zab2 <zab2@mail.i2p>
Date: Thu, 18 Jul 2013 22:45:11 +0000
Subject: [PATCH] Prepare for merge

---
 history.txt                                       | 5 +++++
 router/java/src/net/i2p/router/RouterVersion.java | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/history.txt b/history.txt
index bcb76e513..706420e85 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,8 @@
+2012-07-19 zab
+* Streaming:
+  - initialize streaming RTT from sample, trac #979, RFC 6298
+  - store rttDev in TCBCache
+
 * 2013-07-15 0.9.7 released
 
 2013-07-11 kytv
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 3668b214a..87e5bffca 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,10 +18,10 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 0;
+    public final static long BUILD = 1;
 
     /** for example "-test" */
-    public final static String EXTRA = "-979";
+    public final static String EXTRA = "";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + FULL_VERSION);