diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-06 07:21:11 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-06 07:21:11 (GMT) |
| commit | fb70a0a603baeae3cf6078aa92bb7a2a961d8c1f (patch) | |
| tree | a1daa7353e8cd4564fa5e92513681974ecf70273 /src/plugins/platforms | |
| parent | ad04d96fdac0fea252096d5144abf684516cbb10 (diff) | |
| parent | c743e81790213db0c9a4abcee993fce0368b6367 (diff) | |
| download | Qt-fb70a0a603baeae3cf6078aa92bb7a2a961d8c1f.zip Qt-fb70a0a603baeae3cf6078aa92bb7a2a961d8c1f.tar.gz Qt-fb70a0a603baeae3cf6078aa92bb7a2a961d8c1f.tar.bz2 | |
Merge branch 'lighthouse-4.7' into lighthouse-master
Conflicts:
src/gui/painting/qpdf.cpp
Diffstat (limited to 'src/plugins/platforms')
0 files changed, 0 insertions, 0 deletions