diff options
| author | emusic <emina.music@egiz.gv.at> | 2018-11-22 13:14:28 +0100 |
|---|---|---|
| committer | emusic <emina.music@egiz.gv.at> | 2018-11-22 13:14:28 +0100 |
| commit | f76f559c8c1437a152a4f51b441e4cebe25430f1 (patch) | |
| tree | 8930f89863cdc7e564f6a97ac777c133384a8730 /.idea/libraries | |
| parent | cd6ff625d48a63e024b05ed1a253be3551e41599 (diff) | |
| parent | c87c82009fb07e285d6c9acfd4686efc2cbf21c9 (diff) | |
| download | pdf-as-4-f76f559c8c1437a152a4f51b441e4cebe25430f1.tar.gz pdf-as-4-f76f559c8c1437a152a4f51b441e4cebe25430f1.tar.bz2 pdf-as-4-f76f559c8c1437a152a4f51b441e4cebe25430f1.zip | |
Merge branch 'SL20_development'
# Conflicts:
# build.gradle
# pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/Main.java
# pdf-as-lib/src/configuration/cfg/advancedconfig.properties
# pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.java
# pdf-as-lib/src/main/resources/config/config.zip
# pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java
# pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/PDFData.java
Diffstat (limited to '.idea/libraries')
4 files changed, 33 insertions, 11 deletions
diff --git a/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5.xml b/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5.xml new file mode 100644 index 00000000..c3e23cab --- /dev/null +++ b/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5.xml @@ -0,0 +1,11 @@ +<component name="libraryTable"> + <library name="Gradle: com.google.code.gson:gson:2.8.5"> + <CLASSES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/c5b4c491aecb72e7c32a78da0b5c6b9cda8dee0f/gson-2.8.5-sources.jar!/" /> + </SOURCES> + </library> +</component>
\ No newline at end of file diff --git a/.idea/libraries/Gradle__org_bitbucket_b_c_jose4j_0_6_3.xml b/.idea/libraries/Gradle__org_bitbucket_b_c_jose4j_0_6_3.xml new file mode 100644 index 00000000..9da71daf --- /dev/null +++ b/.idea/libraries/Gradle__org_bitbucket_b_c_jose4j_0_6_3.xml @@ -0,0 +1,11 @@ +<component name="libraryTable"> + <library name="Gradle: org.bitbucket.b_c:jose4j:0.6.3"> + <CLASSES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.bitbucket.b_c/jose4j/0.6.3/5bf092aa7be6fe8894d11f8d2040a2b3b401a14/jose4j-0.6.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.bitbucket.b_c/jose4j/0.6.3/2ed192025755ff7d79193325ca1793ba22dc10b0/jose4j-0.6.3-sources.jar!/" /> + </SOURCES> + </library> +</component>
\ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_18.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_18.xml deleted file mode 100644 index 9214ea8c..00000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_18.xml +++ /dev/null @@ -1,11 +0,0 @@ -<component name="libraryTable"> - <library name="Gradle: org.slf4j:slf4j-api:1.7.18"> - <CLASSES> - <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.18/b631d286463ced7cc42ee2171fe3beaed2836823/slf4j-api-1.7.18.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.18/a84644a9e9c6ed158b0754aa4af53dc3b7844524/slf4j-api-1.7.18-sources.jar!/" /> - </SOURCES> - </library> -</component>
\ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml new file mode 100644 index 00000000..12bea8a3 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml @@ -0,0 +1,11 @@ +<component name="libraryTable"> + <library name="Gradle: org.slf4j:slf4j-api:1.7.21"> + <CLASSES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.21/139535a69a4239db087de9bab0bee568bf8e0b70/slf4j-api-1.7.21.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.21/f285ac123f201fb4b028bac556928d7cf527ef48/slf4j-api-1.7.21-sources.jar!/" /> + </SOURCES> + </library> +</component>
\ No newline at end of file |