Skip to content
Snippets Groups Projects
Commit acf14dbd authored by Peter Albrecht's avatar Peter Albrecht
Browse files

Merge branch 'feature/skillMemoryGUI' of...

Merge branch 'feature/skillMemoryGUI' of git.h2t.iar.kit.edu:sw/armarx/robot-api into feature/skillMemoryGUI
parents de620594 a4608e51
No related branches found
No related tags found
1 merge request!406Refactor skill memory GUI
Pipeline #17332 passed
#include "gui_utils.h" #include "gui_utils.h"
#include <mutex>
#include <QLayout> #include <QLayout>
#include <QLayoutItem> #include <QLayoutItem>
#include <QSplitter> #include <QSplitter>
......
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
#include <QTreeWidgetItem> #include <QTreeWidgetItem>
#include <QWidget> #include <QWidget>
#include <mutex>
#include <ArmarXCore/core/exceptions/local/ExpressionException.h> #include <ArmarXCore/core/exceptions/local/ExpressionException.h>
namespace armarx::gui namespace armarx::gui
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment