diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-16 14:28:33 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-16 14:28:33 (GMT) |
| commit | bc2a71b317724840c695b39f523ca510c28d15e5 (patch) | |
| tree | e845e8982c04bb52fa5c34308dbf0adabb695e60 /tools/porting | |
| parent | 2a2aa1b0581911de907f7b950b5cf4acda914170 (diff) | |
| parent | d728575ede4fdf3873de71e7cd9a852b9fed4e40 (diff) | |
| download | Qt-bc2a71b317724840c695b39f523ca510c28d15e5.zip Qt-bc2a71b317724840c695b39f523ca510c28d15e5.tar.gz Qt-bc2a71b317724840c695b39f523ca510c28d15e5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Conflicts:
doc/src/declarative/elements.qdoc
Diffstat (limited to 'tools/porting')
0 files changed, 0 insertions, 0 deletions