Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

ArmarXGui
- Activity
- Members
- Labels
- Container Registry
- Model registry

Snippets Groups Projects

27b57c18

Commit 27b57c18 authored 11 years ago by Mirko Wächter

Downloads
- Plain Diff

Merge branch 'master' of https://i61wiki.itec.uka.de/git/armarxgui

parents c28f0d20 60acd30a

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

source/Gui/gui_plugins/StateChartPlugin/Graph.cpp 33 additions, 25 deletions

source/Gui/gui_plugins/StateChartPlugin/Graph.cpp
source/Gui/gui_plugins/StateChartPlugin/Graph.h 65 additions, 14 deletions

source/Gui/gui_plugins/StateChartPlugin/Graph.h
source/Gui/gui_plugins/StateChartPlugin/StateChartGraph.cpp 12 additions, 7 deletions

source/Gui/gui_plugins/StateChartPlugin/StateChartGraph.cpp
source/Gui/gui_plugins/StateChartPlugin/StateChartGraphEdge.cpp 8 additions, 2 deletions

.../Gui/gui_plugins/StateChartPlugin/StateChartGraphEdge.cpp
source/Gui/gui_plugins/StateChartPlugin/StateChartGraphEdge.h 7 additions, 1 deletion

...ce/Gui/gui_plugins/StateChartPlugin/StateChartGraphEdge.h
source/Gui/gui_plugins/StateChartPlugin/StateChartGraphGuiPlugin.cpp 0 additions, 4 deletions

...gui_plugins/StateChartPlugin/StateChartGraphGuiPlugin.cpp

with 125 additions and 53 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment