merge of 'ad0ab5020bb253c5233ac2f036c0cf4f40001d51'

and 'bc7c0fa32e955a7d8185456815652d4baab500ae'
This commit is contained in:
zzz
2013-10-13 19:38:48 +00:00
2 changed files with 1 additions and 2 deletions

View File

@@ -187,7 +187,6 @@ public class SessionConfig extends DataStructureImpl {
public void readBytes(InputStream rawConfig) throws DataFormatException, IOException {
_destination = Destination.create(rawConfig);
_destination.readBytes(rawConfig);
_options = DataHelper.readProperties(rawConfig);
_creationDate = DataHelper.readDate(rawConfig);
_signature = new Signature();

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 = 2;
public final static long BUILD = 3;
/** for example "-test" */
public final static String EXTRA = "";