Merge branch 'master' of ssh://wisemapping.com/var/git-repos/wise-source

Browse Source

Conflicts:
	wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java

...

This commit is contained in:

Paulo Gustavo Veiga

2011-04-06 17:34:17 -03:00

parent 0420cc1d03 c9ff2e23d5

commit c5aa23dbc4

5 changed files with 57 additions and 42 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

wise-webapp/src/test/data/svg/map5.png Normal file