Changeset 0c0a25b


Ignore:
Timestamp:
Oct 13, 2013 7:38:48 PM (7 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
3ec6028
Parents:
d0f635e3 (diff), 208192f (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 'ad0ab5020bb253c5233ac2f036c0cf4f40001d51'

and 'bc7c0fa32e955a7d8185456815652d4baab500ae'

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • core/java/src/net/i2p/data/i2cp/SessionConfig.java

    rd0f635e3 r0c0a25b  
    188188    public void readBytes(InputStream rawConfig) throws DataFormatException, IOException {
    189189        _destination = Destination.create(rawConfig);
    190         _destination.readBytes(rawConfig);
    191190        _options = DataHelper.readProperties(rawConfig);
    192191        _creationDate = DataHelper.readDate(rawConfig);
  • router/java/src/net/i2p/router/RouterVersion.java

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