wisemapping-open-source/web2d/src
Paulo Gustavo Veiga fe8516bb94 Merge branch 'master' into db-purge
Conflicts:
	wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
2012-11-05 20:40:54 -03:00
..
main/javascript Merge branch 'master' into db-purge 2012-11-05 20:40:54 -03:00
test/javascript Update copyright year. 2012-11-01 21:35:01 -03:00