Revision 339a712...

Go back to digest for 9th November 2014

Other in Educational

Andreas Cord-Landwehr committed changes in [rocs] /:

Merge branch 'frameworks'

Conflicts:
RocsCore/DataStructures/LinkedList/rocs_ListStructure.desktop
RocsCore/DataStructures/RootedTree/rocs_RootedTreeStructure.desktop
RocsCore/LoadSave/Plugins/kmlFileFormat/rocs_kmlfileformatplugin.desktop

DIGEST: frameworks is stable enough to become master \o/

File Changes

Modified 7 files
  •   libgraphtheory/editorplugins/assignvalues/assignvaluesplugin.desktop
  •   libgraphtheory/editorplugins/generategraph/generategraphplugin.desktop
  •   libgraphtheory/editorplugins/transformedges/transformedgesplugin.desktop
  •   libgraphtheory/fileformats/dot/dotfileformat.desktop
  •   libgraphtheory/fileformats/gml/gmlfileformat.desktop
  •   libgraphtheory/fileformats/tgf/tgffileformat.desktop
  •   libgraphtheory/fileformats/tikz/tikzfileformat.desktop
7 files changed in total