Paulo Gustavo Veiga eefad1c7f6 Merge branch 'develop' ... Conflicts: core-js/pom.xml mindplot/pom.xml pom.xml web2d/pom.xml wise-editor/pom.xml wise-webapp/pom.xml		2015-02-21 13:10:07 -03:00
..
src	fixing note edition	2015-02-12 22:58:28 -03:00
pom.xml	Merge branch 'develop'	2015-02-21 13:10:07 -03:00