diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-05-12 13:12:13 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-05-12 13:12:13 (GMT) |
| commit | bd11cdf472674af3b00d7d64c64023adbf5ee725 (patch) | |
| tree | 99eb333a12f7e0d109b9ce9ff51120c612669d7a /src/imports/widgets/qmldir | |
| parent | 50fa9ebe8fc0e7eca7536a8663c86cd6b98b2c04 (diff) | |
| parent | 0ebc9783d8ca0c4b27208bbc002c53c52c19ab4c (diff) | |
| download | Qt-bd11cdf472674af3b00d7d64c64023adbf5ee725.zip Qt-bd11cdf472674af3b00d7d64c64023adbf5ee725.tar.gz Qt-bd11cdf472674af3b00d7d64c64023adbf5ee725.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/imports/widgets/qmldir')
| -rw-r--r-- | src/imports/widgets/qmldir | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/imports/widgets/qmldir b/src/imports/widgets/qmldir deleted file mode 100644 index 6f19878..0000000 --- a/src/imports/widgets/qmldir +++ /dev/null @@ -1 +0,0 @@ -plugin widgets |