diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-10-29 03:32:27 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-10-29 03:32:27 (GMT) |
| commit | e5e62799cde71e9b3142dc798f138b99d9890f18 (patch) | |
| tree | a4c2fcfdd1e5da25ddd20c09393453e7684064f6 /src/gui | |
| parent | 6c548e21f48b07d55187952ff21cbbc23fdd3927 (diff) | |
| download | Qt-e5e62799cde71e9b3142dc798f138b99d9890f18.zip Qt-e5e62799cde71e9b3142dc798f138b99d9890f18.tar.gz Qt-e5e62799cde71e9b3142dc798f138b99d9890f18.tar.bz2 | |
fix merge duplication
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/math3d/qvector3d.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/math3d/qvector3d.cpp b/src/gui/math3d/qvector3d.cpp index e17cbdf..9552e3a 100644 --- a/src/gui/math3d/qvector3d.cpp +++ b/src/gui/math3d/qvector3d.cpp @@ -45,7 +45,6 @@ #include <QtCore/qmath.h> #include <QtCore/qvariant.h> #include <QtCore/qdebug.h> -#include <QtCore/qvariant.h> QT_BEGIN_NAMESPACE |