diff options
| author | Marius Bugge Monsen <mmonsen@trolltech.com> | 2009-09-29 15:53:33 +0200 |
|---|---|---|
| committer | Marius Bugge Monsen <mmonsen@trolltech.com> | 2009-09-29 15:53:33 +0200 |
| commit | 12c7dcebf2d50a90a718bcdd05b8ad5cdbde31da (patch) | |
| tree | cd2f92828d0738451d376909262cdb674b2c5962 /src/experimental/qgraphicsflowview.h | |
| parent | abc2891bc4f3147d9e305eeaa8d16671b309d111 (diff) | |
| parent | e8c752a9274e7531732db06ae1e68cf6480b2634 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:research/itemviews-ng
Conflicts:
src/qgraphicslistview.h
Diffstat (limited to 'src/experimental/qgraphicsflowview.h')
| -rw-r--r-- | src/experimental/qgraphicsflowview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/experimental/qgraphicsflowview.h b/src/experimental/qgraphicsflowview.h index 5ba64e0..f38493a 100644 --- a/src/experimental/qgraphicsflowview.h +++ b/src/experimental/qgraphicsflowview.h @@ -23,7 +23,7 @@ #ifndef QTGRAPHICSFLOWVIEW_H #define QTGRAPHICSFLOWVIEW_H -#include "qgraphicslistview.h" +#include "../qgraphicslistview.h" class QtGraphicsFlowViewPrivate; |