diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-28 11:10:40 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-28 11:10:40 (GMT) |
| commit | 8f3cbe7e844ee49b1e25544d9b90218b00efa548 (patch) | |
| tree | 73e501612ef8efdbfce8afbc5d8c6abe109190d3 /src/script/script.pri | |
| parent | 00cb03e2dfbcaca69da980dc79d5b062d4b09028 (diff) | |
| parent | 5b90f7c27e7e4a95c75421fa42345b3268707794 (diff) | |
| download | Qt-8f3cbe7e844ee49b1e25544d9b90218b00efa548.zip Qt-8f3cbe7e844ee49b1e25544d9b90218b00efa548.tar.gz Qt-8f3cbe7e844ee49b1e25544d9b90218b00efa548.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/script/script.pri')
| -rw-r--r-- | src/script/script.pri | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/script/script.pri b/src/script/script.pri index 2ee1a82..9cd71d3 100644 --- a/src/script/script.pri +++ b/src/script/script.pri @@ -1,4 +1,3 @@ include($$PWD/api/api.pri) include($$PWD/bridge/bridge.pri) include($$PWD/parser/parser.pri) -include($$PWD/utils/utils.pri) |