Changeset 99c5a19

Timestamp:

May 22, 2014 6:09:55 PM (7 years ago)

Author:

kytv <kytv@…>

Branches:

master

Children:

0537a22

Parents:

d106f48 (diff), dee84e7 (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 'be06d7987687efb0d6b027f04a2efbf702218677'

and 'f6541fdc88966f2e0e510c2291b33cf716a3a62a'

Files:

• apps/desktopgui/.classpath (modified) (1 diff)
• apps/routerconsole/.classpath (moved) (moved from apps/routerconsole/java/.classpath) (2 diffs)
• apps/routerconsole/.project (moved) (moved from apps/routerconsole/java/.project)
• apps/susidns/src/.classpath (modified) (1 diff)
• installer/.classpath (added)
• installer/.project (added)
• installer/lib/.project (deleted)

apps/desktopgui/.classpath

@@ -4 +4 @@
         <classpathentry combineaccessrules="false" kind="src" path="/i2p_router"/>
         <classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
-        <classpathentry kind="lib" path="/lib/wrapper/all/wrapper.jar"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+        <classpathentry combineaccessrules="false" kind="src" path="/installer"/>
         <classpathentry kind="output" path="build"/>
 </classpath>

apps/routerconsole/.classpath

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-        <classpathentry kind="src" path="src"/>
+        <classpathentry kind="src" path="java/src"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
         <classpathentry combineaccessrules="false" kind="src" path="/desktopgui"/>
@@ -9 +9 @@
         <classpathentry combineaccessrules="false" kind="src" path="/jrobin"/>
         <classpathentry combineaccessrules="false" kind="src" path="/systray"/>
-        <classpathentry kind="lib" path="/lib/wrapper/all/wrapper.jar"/>
-        <classpathentry kind="output" path="build/obj"/>
+        <classpathentry combineaccessrules="false" kind="src" path="/installer"/>
+        <classpathentry kind="output" path="java/build/obj"/>
 </classpath>

apps/susidns/src/.classpath

@@ -3 +3 @@
         <classpathentry kind="src" path="java/src"/>
         <classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
-        <classpathentry kind="lib" path="WEB-INF/lib/jstl.jar"/>
-        <classpathentry kind="lib" path="WEB-INF/lib/standard.jar"/>
+        <classpathentry exported="true" kind="lib" path="WEB-INF/lib/jstl.jar"/>
+        <classpathentry exported="true" kind="lib" path="WEB-INF/lib/standard.jar"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
         <classpathentry kind="output" path="WEB-INF/classes"/>