merge of '0cba2bb826dad461c044d43aa12e6e3ad69f6ce1'

and 'ae0b80d9420ce8dcb103095523b98072eada7fa0'
This commit is contained in:
kytv
2011-10-08 15:20:33 +00:00
4 changed files with 3 additions and 3 deletions

View File

@@ -789,8 +789,8 @@
<copy todir="pkg-temp/docs/" >
<fileset dir="installer/resources/readme/" includes="readme*.html" />
<fileset dir="installer/resources/proxy/" includes="*.ht" />
<!-- lang_ar.png added in 0.8.4, je.png and eu.png added in 0.8.9 -->
<fileset dir="installer/resources/" includes="icons/flags/lang_ar.png icons/flags/je.png icons/flags/eu.png" />
<!-- lang_ar.png added in 0.8.4; a1,a2,je, and eu.png added in 0.8.9 -->
<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" />
</copy>
</target>

Binary file not shown.

After

Width:  |  Height:  |  Size: 143 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 143 B

View File

@@ -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 = 29;
public final static long BUILD = 30;
/** for example "-test" */
public final static String EXTRA = "-rc";