diff options
| author | Maurice Kalinowski <maurice.kalinowski@nokia.com> | 2010-03-01 12:54:34 (GMT) |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@nokia.com> | 2010-03-01 12:54:34 (GMT) |
| commit | 5841e1d4662c97433a09ac0e3c6430145ee7ddee (patch) | |
| tree | a76239336c477ebfce224f35038ad603a9579051 /tools | |
| parent | 4795583b42577259499b34da07077f501e45ce42 (diff) | |
| parent | dd4079c6c465c80104ff0ea1cda681ed7cc18310 (diff) | |
| download | Qt-5841e1d4662c97433a09ac0e3c6430145ee7ddee.zip Qt-5841e1d4662c97433a09ac0e3c6430145ee7ddee.tar.gz Qt-5841e1d4662c97433a09ac0e3c6430145ee7ddee.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo1_47
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/test/qdeclarative.qdocconf (renamed from tools/qdoc3/test/qml.qdocconf) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/tools/qdoc3/test/qml.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf index 3b5d8dc..3b5d8dc 100644 --- a/tools/qdoc3/test/qml.qdocconf +++ b/tools/qdoc3/test/qdeclarative.qdocconf |