diff options
| author | Geir Vattekar <geir.vattekar@nokia.com> | 2010-06-29 13:13:40 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@nokia.com> | 2010-06-29 13:13:40 (GMT) |
| commit | c2c720cf948f2779aa82e003a2db4d951f94e77f (patch) | |
| tree | 0f3662fcf8a336f6cd7d5090184f7ead2336691e /src/gui/painting/qcups.cpp | |
| parent | 497fd44414dea6314731b96869e2d49bb8b439b5 (diff) | |
| parent | 1209a398c3b59b21b38036fffd4fb2442320e5c3 (diff) | |
| download | Qt-c2c720cf948f2779aa82e003a2db4d951f94e77f.zip Qt-c2c720cf948f2779aa82e003a2db4d951f94e77f.tar.gz Qt-c2c720cf948f2779aa82e003a2db4d951f94e77f.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/painting/qcups.cpp')
0 files changed, 0 insertions, 0 deletions