Commit Graph

9 Commits

Author SHA1 Message Date
Robert Haschke
0494f1c93b [Tree|Flat]MergeProxyModel: cleanup index mapping when removing rows 2018-03-23 11:22:23 +01:00
v4hn
4f2b38f02d add missing headers 2018-02-21 14:56:51 +01:00
Robert Haschke
1403fc9830 fixed some clang warnings 2018-02-12 22:36:12 +01:00
Robert Haschke
5c1cad14df Merge branches 'fixes', 'wip-drag-n-drop', 'wip-ikstage' and 'wip-marker-vis'
resolved conflicts:
core/include/moveit/task_constructor/container.h
core/src/container.cpp
core/src/stages/generate_grasp_pose.cpp
visualization/motion_planning_tasks/src/task_display.cpp
visualization/motion_planning_tasks/src/task_panel_p.h
2018-02-04 21:36:01 +01:00
Robert Haschke
d9be19bbe8 re-enable drag-n-drop to edit task pipeline 2018-02-04 21:30:25 +01:00
Robert Haschke
faa7b38ff9 fix flaky "deletion" unittest 2018-02-04 20:59:16 +01:00
v4hn
7319711973 reduce catkin_lint complains in visualization 2017-12-08 20:56:12 +01:00
Robert Haschke
40cfceb557 fix Trusty/Indigo build 2017-11-24 15:12:38 +01:00
Robert Haschke
92ce7e7efe MergeProxyModel 2017-11-24 00:40:48 +01:00