Skip to content

Commit 12592ef

Browse files
committed
Merge pull request #42 from phillipross/master
Merging OSGeo-Live test utility and other dependency updates
2 parents 282680d + 17b74d7 commit 12592ef

29 files changed

+583
-142
lines changed

.idea/compiler.xml

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/encodings.xml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_3.xml renamed to .idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_3.xml renamed to .idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__junit_junit_4_10.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.idea/libraries/Maven__org_apache_ant_ant_1_7_0.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.idea/libraries/Maven__org_apache_ant_ant_launcher_1_7_0.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.idea/libraries/Maven__org_postgresql_postgresql_9_4_1208_jre7.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_13.xml renamed to .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)