This commit is contained in:
Cestaberous
2015-06-05 10:51:33 -05:00
409 changed files with 30290 additions and 0 deletions

View File

@@ -1,4 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<dirs>
<<<<<<< HEAD
<entry loc="/usr/lib/jvm/java-7-openjdk-amd64" stamp="1433462559000"/>
=======
<entry loc="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.31-5.b13.fc21.x86_64" stamp="1426736504000"/>
>>>>>>> e3b5f5f77f61b7a685fc1fc9109f8de395ab933d
</dirs>

View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<libraryInfos>
<<<<<<< HEAD
<libraryInfo home="/usr/lib/jvm/java-7-openjdk-amd64" version="1.7.0_79">
<bootpath>
<entry path="/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/resources.jar"/>
@@ -18,6 +19,25 @@
</extensionDirs>
<endorsedDirs>
<entry path="/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/endorsed"/>
=======
<libraryInfo home="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.31-5.b13.fc21.x86_64" version="1.8.0_31">
<bootpath>
<entry path="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.31-5.b13.fc21.x86_64/jre/lib/resources.jar"/>
<entry path="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.31-5.b13.fc21.x86_64/jre/lib/rt.jar"/>
<entry path="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.31-5.b13.fc21.x86_64/jre/lib/sunrsasign.jar"/>
<entry path="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.31-5.b13.fc21.x86_64/jre/lib/jsse.jar"/>
<entry path="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.31-5.b13.fc21.x86_64/jre/lib/jce.jar"/>
<entry path="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.31-5.b13.fc21.x86_64/jre/lib/charsets.jar"/>
<entry path="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.31-5.b13.fc21.x86_64/jre/lib/jfr.jar"/>
<entry path="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.31-5.b13.fc21.x86_64/jre/classes"/>
</bootpath>
<extensionDirs>
<entry path="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.31-5.b13.fc21.x86_64/jre/lib/ext"/>
<entry path="/usr/java/packages/lib/ext"/>
</extensionDirs>
<endorsedDirs>
<entry path="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.31-5.b13.fc21.x86_64/jre/lib/endorsed"/>
>>>>>>> e3b5f5f77f61b7a685fc1fc9109f8de395ab933d
</endorsedDirs>
</libraryInfo>
</libraryInfos>