Merge
This commit is contained in:
commit
93603c443d
@ -43,14 +43,6 @@
|
|||||||
Run 'make help' for help using the Makefile.
|
Run 'make help' for help using the Makefile.
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<!-- Mac is special, need to downgrade these before build.properties. -->
|
|
||||||
<condition property="javac.source" value="1.5">
|
|
||||||
<os family="mac"/>
|
|
||||||
</condition>
|
|
||||||
<condition property="javac.target" value="1.5">
|
|
||||||
<os family="mac"/>
|
|
||||||
</condition>
|
|
||||||
|
|
||||||
<!-- Project build properties. -->
|
<!-- Project build properties. -->
|
||||||
<property file="build.properties"/>
|
<property file="build.properties"/>
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
# Properties for jprt
|
# Properties for jprt
|
||||||
|
|
||||||
# The release to build
|
# Locked down to jdk8
|
||||||
jprt.tools.default.release=jdk8
|
jprt.tools.default.release=jdk8
|
||||||
|
|
||||||
# The different build flavors we want, we override here so we just get these 2
|
# The different build flavors we want, we override here so we just get these 2
|
||||||
|
Loading…
x
Reference in New Issue
Block a user