summaryrefslogtreecommitdiff
path: root/projects.pro
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-05-27 23:04:41 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2009-05-27 23:04:41 +0200
commitfcfdccc03b6dd26a82e87a6b6a0ca48d67f78cf6 (patch)
tree2cdd417bc0be39b12674f33052462d19d9e38ef9 /projects.pro
parent7b1f8c542bc9f41408f0a54b853d75d0c09a2775 (diff)
parentd0bc0a26f8ac4c2f02819c262b8aa7c3dd1cad3b (diff)
downloadqt4-tools-fcfdccc03b6dd26a82e87a6b6a0ca48d67f78cf6.tar.gz
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
Diffstat (limited to 'projects.pro')
0 files changed, 0 insertions, 0 deletions