diff --git a/LICENSE.txt b/LICENSE.txt index db99aa5fc2..87e1419e8f 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -197,6 +197,7 @@ Applications: - Guernsey and Isle of Man flags from the Open Clip Art Library, released into the public domain - All other flag icons: public domain, courtesy mjames@gmail.com http://www.famfamfam.com/ Silk icons: See licenses/LICENSE-SilkIcons.txt + FatCow icons: See licenses/LICENSE-FatCowIcons.txt GeoIP Data: Copyright (c) 2008 MaxMind, Inc. All Rights Reserved. diff --git a/history.txt b/history.txt index 63cc8abfbe..27b9efcdc3 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,8 @@ +2012-07-24 str4d + * Home page: + - Replaced 16x16 icons with 32x32 ones + - Updated icon for git.repo.i2p + 2012-07-24 zzz * LookaheadInputStream: Fix bug causing gunzip fails, esp. on Android * Router: Don't create router.ping file on Android diff --git a/licenses/LICENSE-FatCowIcons.txt b/licenses/LICENSE-FatCowIcons.txt new file mode 100644 index 0000000000..42ef84838a --- /dev/null +++ b/licenses/LICENSE-FatCowIcons.txt @@ -0,0 +1,22 @@ +FatCow Free "Farm-Fresh Web Icons" + +_________________________________________ +FatCow +http://www.fatcow.com/free-icons +_________________________________________ + +These icon sets are licensed under a +Creative Commons Attribution 3.0 License. +[ http://creativecommons.org/licenses/by/3.0/ ] + +This means you can freely use these icons for +any purpose, private and commercial, including +online services, templates, themes and software. +However, you should include a link to this page +in your credits. + +The icons may not be resold, sub-licensed, rented, +transferred or otherwise made available for use. + +Please link to this page on fatcow.com if you +would like to spread the word. diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 285b64c36d..0cd02d33d1 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 = 28; + public final static long BUILD = 29; /** for example "-test" */ public final static String EXTRA = "-rc";