diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-23 20:45:26 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-23 20:45:26 (GMT) |
| commit | d54407928be05781ede2358baba2f2f91749cc80 (patch) | |
| tree | 0a7f387c9542f750236783eb39b9cd26c9693328 /src/imports | |
| parent | 4e40c388aef3cb16a1492764c37ae8ba929e8aef (diff) | |
| parent | 6c0c437962a2638cca162277b14a30dae4fed57b (diff) | |
| download | Qt-d54407928be05781ede2358baba2f2f91749cc80.zip Qt-d54407928be05781ede2358baba2f2f91749cc80.tar.gz Qt-d54407928be05781ede2358baba2f2f91749cc80.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Conflicts:
doc/src/index.qdoc
Diffstat (limited to 'src/imports')
0 files changed, 0 insertions, 0 deletions