#GH363 - Custom markers for sdiff
GH363-custom-markers-for-sdiff
#405 - Propagate sync and conflict flags directly from algorithm -
solved conflicts and sync, solved tests for them
#405 - Propagate sync and conflict flags directly from algorithm -
removed hardcoded path for file, disabled controllers during sync
Merge remote-tracking branch 'origin/master' into GH405-propagate-flags-from-codesync-algorithm
Merge remote-tracking branch 'origin/master' into GH363-custom-markers-for-sdiff
#363 - Custom markers for sdiff - first revision
#417 - Sdiff Tests
#405 - Propagate sync and conflict flags directly from algorithm - first
revision
#417 - Sdiff Tests (2)
#417 - Switch on diffType
Merge remote-tracking branch 'origin/master' into GH417-sdiff-unit-tests
Merge remote-tracking branch 'origin/GH363-custom-markers-for-sdiff'
Merge remote-tracking branch
'origin/GH405-propagate-flags-from-codesync-algorithm'
#GH115 - freeplane node 1
#GH115 - mindmap properties provider; parsing all properties
Added all graphical properties (+ icons)
Merge remote-tracking branch 'origin/GH115-process-all-properties' into GH294-Refactor-Renderer-add-BaseFlexDiagramRenderer
#GH115 - mindmap properties provider; parsing all properties(3)
Merge remote-tracking branch 'origin/GH115-process-all-properties' into
GH115-process-all-properties

Conflicts:
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/controller/MindMapPropertiesProvider1.java
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/controller/xml_parser/ConvertAllAttributesProcessor.java
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/controller/xml_parser/DuplicateTagProcessor.java
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/controller/xml_parser/TagFullContentProcessor.java
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/controller/xml_parser/TagsAsCsvListProcessor.java
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/controller/xml_parser/XmlNodePropertiesParser.java
	org.flowerplatform.tests/src/org/flowerplatform/tests/freeplane/XmlParserTest.java