Changeset 02219f7


Ignore:
Timestamp:
Oct 8, 2011 3:20:33 PM (8 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
c884cfe6
Parents:
66ba367 (diff), 8340549 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '0cba2bb826dad461c044d43aa12e6e3ad69f6ce1'

and 'ae0b80d9420ce8dcb103095523b98072eada7fa0'

Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r66ba367 r02219f7  
    790790          <fileset dir="installer/resources/readme/" includes="readme*.html" />
    791791          <fileset dir="installer/resources/proxy/" includes="*.ht" />
    792           <!-- lang_ar.png added in 0.8.4, je.png and eu.png added in 0.8.9 -->
    793           <fileset dir="installer/resources/" includes="icons/flags/lang_ar.png icons/flags/je.png icons/flags/eu.png" />
     792          <!-- lang_ar.png added in 0.8.4; a1,a2,je, and eu.png added in 0.8.9 -->
     793          <fileset dir="installer/resources/" includes="icons/flags/lang_ar.png icons/flags/je.png icons/flags/eu.png icons/flags/a1.png icons/flags/a2.png" />
    794794        </copy>
    795795    </target>
  • router/java/src/net/i2p/router/RouterVersion.java

    r66ba367 r02219f7  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 29;
     21    public final static long BUILD = 30;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.