summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@nokia.com>2010-09-13 11:49:35 (GMT)
committerPaul Olav Tvete <paul.tvete@nokia.com>2010-09-13 11:54:30 (GMT)
commit33e7ee9d1866f12a9b92fe4b5549c31e30974d8e (patch)
tree72031d16ebed89a60590ce2392803888f99369f7 /dist
parent06dc8791a70329dc8e985a0eed7e434d1f762ec5 (diff)
parent8f9d38ed63a2c568596febe5ea59a55fe03d7ba9 (diff)
downloadQt-33e7ee9d1866f12a9b92fe4b5549c31e30974d8e.zip
Qt-33e7ee9d1866f12a9b92fe4b5549c31e30974d8e.tar.gz
Qt-33e7ee9d1866f12a9b92fe4b5549c31e30974d8e.tar.bz2
Merge remote branch 'lighthouse/4.7' into lighthouse-master
Conflicts: src/gui/text/text.pri src/plugins/generic/linuxinput/qlinuxinput.cpp
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions