diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-21 16:38:25 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-21 16:38:25 (GMT) |
| commit | 123a3aacd6a40fb07a225ef4db34ff7f986363ce (patch) | |
| tree | 69744fb08a3b0dd4e246b90d2e90d4f533ca768b /src/corelib/global | |
| parent | f92501a82f5bca1ccac07ed17850c84b281a1fb1 (diff) | |
| parent | 12689cc05936d675c8a7065cf39b8334b83f95bb (diff) | |
| download | Qt-123a3aacd6a40fb07a225ef4db34ff7f986363ce.zip Qt-123a3aacd6a40fb07a225ef4db34ff7f986363ce.tar.gz Qt-123a3aacd6a40fb07a225ef4db34ff7f986363ce.tar.bz2 | |
Merge remote-tracking branch 'mainline/4.7' into 4.7
Conflicts:
dist/changes-4.7.4
Diffstat (limited to 'src/corelib/global')
0 files changed, 0 insertions, 0 deletions