summaryrefslogtreecommitdiff
path: root/eaaf_core
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2018-07-25 13:04:20 +0200
committerThomas Lenz <thomas.lenz@egiz.gv.at>2018-07-25 13:04:20 +0200
commitea49fa2d28078d889e9f8147a3ef274301beec52 (patch)
treecbf6a3a4bc22dc3e2500ab97f7424b5913489cf0 /eaaf_core
parentc7f57bf447d5ec6883ce53d64559ae50462dd570 (diff)
parent36e4066b9c739ba04925025c5975a11da65bfc92 (diff)
downloadEAAF-Components-ea49fa2d28078d889e9f8147a3ef274301beec52.tar.gz
EAAF-Components-ea49fa2d28078d889e9f8147a3ef274301beec52.tar.bz2
EAAF-Components-ea49fa2d28078d889e9f8147a3ef274301beec52.zip
Merge branch 'master' of gitlab.iaik.tugraz.at:egiz/eaaf_components
# Conflicts: # eaaf_core/pom.xml
Diffstat (limited to 'eaaf_core')
-rw-r--r--eaaf_core/pom.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/eaaf_core/pom.xml b/eaaf_core/pom.xml
index 6b236ac6..27e5a52d 100644
--- a/eaaf_core/pom.xml
+++ b/eaaf_core/pom.xml
@@ -151,4 +151,4 @@
</plugins>
</build>
-</project> \ No newline at end of file
+</project>