zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source 
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-06 22:48:58 -03:00
parent dfaa8ccd89 8436ad286c
commit 6ce24d39df
215 changed files with 22759 additions and 10220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web2d/pom.xml
View File

@@ -9,7 +9,7 @@
<groupId>org.wisemapping</groupId>
<artifactId>wisemapping</artifactId>
<relativePath>../pom.xml</relativePath>
<version>3.0.4</version>
<version>4.0.0</version>
</parent>
<build>