Commit 441faa3a authored by Christian Pichot's avatar Christian Pichot
Browse files

Merge branch 'dev_pcl' into 'dev_cp'

merging from PC to CP - Added lib dir and updated pom.xml in order to compile (mvn package)

See merge request !1
parents 480378e0 4e0c5536
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</repository> </repository>
<repository> <repository>
<id>aml-lib</id> <id>aml-lib</id>
<url>file://${project.basedir}/src/lib</url> <url>file://${project.basedir}/lib</url>
</repository> </repository>
</repositories> </repositories>
<properties> <properties>
...@@ -135,8 +135,6 @@ ...@@ -135,8 +135,6 @@
<groupId></groupId> <groupId></groupId>
<artifactId>simmetrics</artifactId> <artifactId>simmetrics</artifactId>
<version>1.6.2</version> <version>1.6.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.swinglabs.swingx</groupId> <groupId>org.swinglabs.swingx</groupId>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment