Ignore:
Timestamp:
Nov 3, 2010 4:04:14 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
2b2c3cf
Parents:
9b39f02 (diff), ddc86b54 (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 '398a24f487b61ef778a2e849660e953ef7e43b39'

and '598d00efae4c9b675b64fd626bc2eab2b921e0c5'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • core/java/build.xml

    r9b39f02 rbe308a0  
    1818    <!-- only used if not set by a higher build.xml -->
    1919    <property name="javac.compilerargs" value="" />
     20    <property name="javac.classpath" value="" />
    2021    <target name="compile" depends="depend">
    2122        <mkdir dir="./build" />
    2223        <mkdir dir="./build/obj" />
    23         <javac srcdir="./src" debug="true" source="1.5" target="1.5" deprecation="on" destdir="./build/obj" >
     24        <javac srcdir="./src" debug="true" source="1.5" target="1.5" deprecation="on" destdir="./build/obj" classpath="${javac.classpath}" >
    2425            <compilerarg line="${javac.compilerargs}" />
    2526        </javac>
Note: See TracChangeset for help on using the changeset viewer.