Changeset 99c5a19


Ignore:
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:
2 added
1 deleted
2 edited
2 moved

Legend:

Unmodified
Added
Removed
  • apps/desktopgui/.classpath

    rd106f48 r99c5a19  
    44        <classpathentry combineaccessrules="false" kind="src" path="/i2p_router"/>
    55        <classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
    6         <classpathentry kind="lib" path="/lib/wrapper/all/wrapper.jar"/>
    76        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
     7        <classpathentry combineaccessrules="false" kind="src" path="/installer"/>
    88        <classpathentry kind="output" path="build"/>
    99</classpath>
  • apps/routerconsole/.classpath

    rd106f48 r99c5a19  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<classpath>
    3         <classpathentry kind="src" path="src"/>
     3        <classpathentry kind="src" path="java/src"/>
    44        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
    55        <classpathentry combineaccessrules="false" kind="src" path="/desktopgui"/>
     
    99        <classpathentry combineaccessrules="false" kind="src" path="/jrobin"/>
    1010        <classpathentry combineaccessrules="false" kind="src" path="/systray"/>
    11         <classpathentry kind="lib" path="/lib/wrapper/all/wrapper.jar"/>
    12         <classpathentry kind="output" path="build/obj"/>
     11        <classpathentry combineaccessrules="false" kind="src" path="/installer"/>
     12        <classpathentry kind="output" path="java/build/obj"/>
    1313</classpath>
  • apps/susidns/src/.classpath

    rd106f48 r99c5a19  
    33        <classpathentry kind="src" path="java/src"/>
    44        <classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
    5         <classpathentry kind="lib" path="WEB-INF/lib/jstl.jar"/>
    6         <classpathentry kind="lib" path="WEB-INF/lib/standard.jar"/>
     5        <classpathentry exported="true" kind="lib" path="WEB-INF/lib/jstl.jar"/>
     6        <classpathentry exported="true" kind="lib" path="WEB-INF/lib/standard.jar"/>
    77        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
    88        <classpathentry kind="output" path="WEB-INF/classes"/>
Note: See TracChangeset for help on using the changeset viewer.