diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-07-28 15:32:59 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-07-28 15:32:59 (GMT) |
| commit | 14aa95bf83e8fa91151b5edd3c346c20d942eb81 (patch) | |
| tree | 46ec6389eb1590e0a018c4acbfba670d315987ba /examples/animation/stickman/editor/editor.pri | |
| parent | 1c72e77e43593dfea6c6392d1058e63762efb534 (diff) | |
| parent | f340825f35ad3de28685f4890cd73bbf9bb6c0e6 (diff) | |
| download | Qt-14aa95bf83e8fa91151b5edd3c346c20d942eb81.zip Qt-14aa95bf83e8fa91151b5edd3c346c20d942eb81.tar.gz Qt-14aa95bf83e8fa91151b5edd3c346c20d942eb81.tar.bz2 | |
Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backend
Conflicts:
src/corelib/tools/qregexp.cpp
src/script/qscriptengine.cpp
src/script/qscriptvalue.cpp
Diffstat (limited to 'examples/animation/stickman/editor/editor.pri')
| -rw-r--r-- | examples/animation/stickman/editor/editor.pri | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/examples/animation/stickman/editor/editor.pri b/examples/animation/stickman/editor/editor.pri deleted file mode 100644 index 7ad9edb..0000000 --- a/examples/animation/stickman/editor/editor.pri +++ /dev/null @@ -1,2 +0,0 @@ -SOURCES += $$PWD/animationdialog.cpp $$PWD/mainwindow.cpp -HEADERS += $$PWD/animationdialog.h $$PWD/mainwindow.h |