Merge sources dir branch devel to trunk

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2613 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2013-11-14 10:11:22 +00:00
parent 434849c3eb
commit 971ce1facb
54 changed files with 594 additions and 1152 deletions

View File

@@ -6,7 +6,7 @@
#include <QSet>
#include <QMultiMap>
#include <QString>
#include "conductor.h"
#include "qetgraphicsitem/conductor.h"
#include "diagram.h"
class ConductorAutoNumerotationWidget : public QDialog