merge of '4238d44d0006a302c8a1fedf06a3789061b71672'
and '44b9f7b1bcd59acc89551681bfab2709ab5e9972'
No related branches found
No related tags found
Showing
- apps/BOB/src/net/i2p/BOB/I2Plistener.java 45 additions, 35 deletionsapps/BOB/src/net/i2p/BOB/I2Plistener.java
- apps/BOB/src/net/i2p/BOB/I2PtoTCP.java 85 additions, 76 deletionsapps/BOB/src/net/i2p/BOB/I2PtoTCP.java
- apps/BOB/src/net/i2p/BOB/MUXlisten.java 137 additions, 168 deletionsapps/BOB/src/net/i2p/BOB/MUXlisten.java
- apps/BOB/src/net/i2p/BOB/TCPlistener.java 61 additions, 50 deletionsapps/BOB/src/net/i2p/BOB/TCPlistener.java
- apps/BOB/src/net/i2p/BOB/TCPtoI2P.java 74 additions, 72 deletionsapps/BOB/src/net/i2p/BOB/TCPtoI2P.java
- apps/addressbook/java/src/addressbook/Servlet.java 2 additions, 1 deletionapps/addressbook/java/src/addressbook/Servlet.java
- apps/desktopgui/nbproject/build-impl.xml 19 additions, 6 deletionsapps/desktopgui/nbproject/build-impl.xml
- apps/desktopgui/nbproject/genfiles.properties 2 additions, 2 deletionsapps/desktopgui/nbproject/genfiles.properties
- apps/desktopgui/src/desktopgui/GUIVersion.java 1 addition, 1 deletionapps/desktopgui/src/desktopgui/GUIVersion.java
- apps/desktopgui/src/gui/GeneralConfiguration.form 83 additions, 55 deletionsapps/desktopgui/src/gui/GeneralConfiguration.form
- apps/desktopgui/src/gui/GeneralConfiguration.java 224 additions, 139 deletionsapps/desktopgui/src/gui/GeneralConfiguration.java
- apps/desktopgui/src/gui/JPopupTrayIcon.java 19 additions, 10 deletionsapps/desktopgui/src/gui/JPopupTrayIcon.java
- apps/desktopgui/src/gui/LogViewer.form 1 addition, 0 deletionsapps/desktopgui/src/gui/LogViewer.form
- apps/desktopgui/src/gui/LogViewer.java 2 additions, 1 deletionapps/desktopgui/src/gui/LogViewer.java
- apps/desktopgui/src/gui/SpeedSelector3.form 2 additions, 1 deletionapps/desktopgui/src/gui/SpeedSelector3.form
- apps/desktopgui/src/gui/SpeedSelector3.java 1 addition, 1 deletionapps/desktopgui/src/gui/SpeedSelector3.java
- apps/desktopgui/src/gui/Version.form 14 additions, 13 deletionsapps/desktopgui/src/gui/Version.form
- apps/desktopgui/src/gui/Version.java 11 additions, 11 deletionsapps/desktopgui/src/gui/Version.java
- apps/desktopgui/src/gui/resources/GeneralConfiguration.properties 12 additions, 12 deletions...ktopgui/src/gui/resources/GeneralConfiguration.properties
- apps/desktopgui/src/gui/resources/LogViewer.properties 1 addition, 0 deletionsapps/desktopgui/src/gui/resources/LogViewer.properties
Loading
Please register or sign in to comment