Commit 6b4e64e3 authored by Florent Lamiraux's avatar Florent Lamiraux Committed by Florent Lamiraux
Browse files

Merge branch 'devel' into qt5

parents 7bc14462 6b190b9f
......@@ -7,7 +7,6 @@ from PythonQt.QtGui import QDockWidget, QWidget, QLabel, QPushButton, QVBoxLayou
from PythonQt.Qt import Qt as QNamespace, QAction, QKeySequence
from hpp.corbaserver import Client as BasicClient
from hpp.corbaserver.manipulation import Client as ManipClient, ConstraintGraph, Rule
from hpp.corbaserver.manipulation.pr2 import Robot
from gepetto.corbaserver import Client as ViewerClient
import re
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment