* merged branches

This commit is contained in:
sponge
2009-05-09 18:26:03 +00:00
parent 9541abc0a4
commit 9bd3bea90a
2 changed files with 4 additions and 1 deletions

View File

@ -1,3 +1,6 @@
2009-05-09 sponge
* merge
2009-05-09 sponge
* fixed OOM on lock (woops! my bad!)

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 = 11;
public final static long BUILD = 12;
/** for example "-test" */
public final static String EXTRA = "";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;