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

Browse Source

Conflicts:
	mindplot/src/main/javascript/MindmapDesigner.js
	mindplot/src/main/javascript/PersistanceManager.js

...

This commit is contained in:

Pablo Luna

2011-03-31 17:37:47 +01:00

parent c4021bf3c4 b850f774fb

commit 183dd367a8

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

Diff Content Not Available