From fa12967873779284bea6978e3aab4e836223513e Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 17 Feb 2016 14:21:51 +0000
Subject: [PATCH] Add qr icon, to be used in buttons created by me, public
 domain

---
 history.txt                                       |   6 ++++++
 installer/resources/themes/console/images/qr.png  | Bin 0 -> 394 bytes
 router/java/src/net/i2p/router/RouterVersion.java |   2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 installer/resources/themes/console/images/qr.png

diff --git a/history.txt b/history.txt
index 70caaa6ad..6a4160883 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,9 @@
+2016-02-17 zzz
+ * i2psnark: Increase max files per torrent to 2000
+ * I2PTunnel: Improve layout of blacklist radio buttons
+ * Router: Switch to new lease sooner before expiration
+ * SAM: Don't log an error on datagram send success
+
 2016-02-13 zzz
  * I2PTunnel:
    - Add options to block by referer and user-agent
diff --git a/installer/resources/themes/console/images/qr.png b/installer/resources/themes/console/images/qr.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9a2b355885d25c1ef59ef6c8c4fc1882ddff6ef
GIT binary patch
literal 394
zcmV;50d@X~P)<h;3K|Lk000e1NJLTq000mG000mO00000I+&on00002VoOIv0RM-N
z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~td0EG84J$lU+{0UJp~K~xyi
z0T2Q2{sBP<{PI0fyAu-9N$z$d1j_>|h|6pFv*w&d5H#@_3{C0+|JSPG{W}GJPTZXZ
z>aWNA0`lo*-}I$X6XpHf_~1_z-2ue>{q-?aK`83|NgK@s1M&k2oEJMvl@920`AQ0X
zF0>B-i2#hKfZkk=_xq;?zyIhz0|qZJEaV(X8tuZM6+XuK3jvTlCVx2u7jk${C1SEQ
z1GE9he*;GVMB<wJ4?N@t6$J7F3-yr6xrrH7?JTk2(W5F$17H@?{$T2A3Lzew#thz5
zX9M<J;v3C$OxWTg!YI<a3-SXf5Og*O2>HqB{|gY8|1ur~09F7k#=}?7%Z9*9>g7Em
o0c+g=`BvBtG8*K>(<y|`kFJD%Su&k0U;qFB07*qoM6N<$f<Pjh5C8xG

literal 0
HcmV?d00001

diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 4e28a2c8d..c10128fe6 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 = 5;
+    public final static long BUILD = 6;
 
     /** for example "-test" */
     public final static String EXTRA = "";