Merge branch 'develop'

Conflicts:
	core-js/pom.xml
	mindplot/pom.xml
	pom.xml
	web2d/pom.xml
	wise-editor/pom.xml
	wise-webapp/pom.xml
This commit is contained in:
Paulo Gustavo Veiga
2015-02-21 13:08:22 -03:00
10 changed files with 35 additions and 11 deletions

View File

@@ -4,7 +4,7 @@
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<properties>
<com.wisemapping.version>4.0.0</com.wisemapping.version>
<com.wisemapping.version>4.0.1</com.wisemapping.version>
<superpom.dir>${project.basedir}/wise-webapps</superpom.dir>
</properties>
@@ -16,7 +16,7 @@
<groupId>org.wisemapping</groupId>
<artifactId>wisemapping</artifactId>
<name>WiseMapping Project</name>
<version>4.0.0</version>
<version>4.0.1</version>
<packaging>pom</packaging>
<licenses>