Merge remote-tracking branch 'origin/master'
ab047b9bf2d8
Actions

Authored by reck on Feb 7 2012, 2:19 PM.

Description

Merge remote-tracking branch 'origin/master'

Details

Committed

reck	Feb 7 2012, 2:19 PM

Parents

R73:c5f90097931a: Fix delete node with in pointer.
R73:4affdff69433: Fix script hooks for list data structure.

Branches

Unknown

Tags

Unknown

reck committed R73:ab047b9bf2d8: Merge remote-tracking branch 'origin/master' (authored by reck).Feb 7 2012, 2:19 PM

Merged Changes

Commit	Author	Details	Committed
4affdff69433	cordlandwehr	Fix script hooks for list data structure.	Feb 3 2012
52eaf4434a08	cordlandwehr	Cleanup of context menu actions: zoom action.	Feb 3 2012
c32b966af086	cordlandwehr	Create specific folder for visual graph editor.	Feb 2 2012
1274241bd89b	cordlandwehr	Fix license issues to be compatible to KDE licensing policy.	Feb 2 2012

Changes (60)

		Path
M		src/Actions/ZoomAction.cpp
M		src/Actions/ZoomAction.h
M		src/CMakeLists.txt
M		src/Core/DataStructurePluginManager.cpp
M		src/Core/DataStructurePluginManager.h
M		src/Core/DocumentManager.cpp
M		src/Core/DocumentManager.h
M		src/Core/DynamicPropertiesList.cpp
M		src/Core/DynamicPropertiesList.h
M		src/Interface/CMakeLists.txt
M		src/Interface/ConfigureDefaultProperties.cpp
V		src/Interface/{ → VisualEditor}/GraphScene.cpp
V		src/Interface/{ → VisualEditor}/GraphScene.h
V		src/Interface/{ → VisualEditor}/GraphVisualEditor.cpp
V		src/Interface/{ → VisualEditor}/GraphVisualEditor.h
M		src/Interface/ImporterExporterManager.cpp
M		src/Interface/ImporterExporterManager.h
M		src/Interface/PossibleIncludes.cpp
M		src/Interface/PossibleIncludes.h
A	(dir)	src/Interface/VisualEditor/
V		src/Interface/{VisualEditor ← }/GraphScene.cpp
V		src/Interface/{VisualEditor ← }/GraphScene.h
V		src/Interface/{VisualEditor ← }/GraphVisualEditor.cpp
V		src/Interface/{VisualEditor ← }/GraphVisualEditor.h
M		src/Interface/edgepropertieswidget.cpp
M		src/Interface/edgepropertieswidget.h
M		src/Plugins/DataStructure/Graph/GraphPlugin.cpp
M		src/Plugins/DataStructure/Graph/GraphPlugin.h
M		src/Plugins/DataStructure/Graph/GraphStructure.cpp
M		src/Plugins/DataStructure/Graph/GraphStructure.h
M		src/Plugins/DataStructure/LinkedList/ListNode.cpp
M		src/Plugins/DataStructure/LinkedList/ListNode.h
M		src/Plugins/DataStructure/LinkedList/ListPlugin.cpp
M		src/Plugins/DataStructure/LinkedList/ListPlugin.h
M		src/Plugins/DataStructure/LinkedList/ListStructure.cpp
M		src/Plugins/DataStructure/LinkedList/ListStructure.h
M		src/Plugins/FilePluginInterface.cpp
M		src/Plugins/FilePluginInterface.h
M		src/Plugins/FilePlugins/GMLParser/GMLParser.cpp
M		src/Plugins/FilePlugins/GMLParser/GMLParser.h
M		src/Plugins/FilePlugins/GMLParser/tests/ParseGMLTest.cpp
M		src/Plugins/FilePlugins/GMLParser/tests/ParseGMLTest.h
M		src/Plugins/FilePlugins/TXTParser/PlainTxtFilePlugin.cpp
M		src/Plugins/FilePlugins/TXTParser/PlainTxtFilePlugin.h
M		src/Plugins/FilePlugins/dotParser/DotParser.cpp
M		src/Plugins/FilePlugins/dotParser/DotParser.h
M		src/Plugins/FilePlugins/dotParser/tests/ParseDotTest.cpp
M		src/Plugins/FilePlugins/dotParser/tests/ParseDotTest.h
M		src/Plugins/FilePlugins/kmlParser/KMLHandler.cpp
M		src/Plugins/FilePlugins/kmlParser/KMLHandler.h
M		src/Plugins/FilePlugins/kmlParser/KMLParser.cpp
M		src/Plugins/FilePlugins/kmlParser/KMLParser.h
P		src/Plugins/FilePlugins/kmlParser/tests/rocs_KMLParserTest.cpp Copied from src/Plugins/DataStructure/Graph/NodeItem.h
P		src/Plugins/FilePlugins/kmlParser/tests/rocs_KMLParserTest.h Copied from src/Core/Group.h
M		src/Plugins/PluginManager.cpp
M		src/Plugins/PluginManager.h
M		src/Tests/TestDataStructure.cpp
M		src/Tests/TestDataStructure.h
M		src/Tests/TestDynamicProperties.cpp
M		src/Tests/TestDynamicProperties.h