diff options
| author | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-09-15 09:45:55 +0200 |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-15 09:46:55 +0200 |
| commit | f78119906b0ffc7fd3dd36d6d827d456478a7fd5 (patch) | |
| tree | e161fe397dedd702f86d186ef32eabcf7cae00d8 /src/gui/itemviews/qsortfilterproxymodel.cpp | |
| parent | 66420856664c7a412b3c9efe4be6ff7a6061e5f2 (diff) | |
| parent | 05ab8ad1577fc038aa2b3bd96cedda54e6a64979 (diff) | |
git Merge branch '4.7-upstream' into 4.7-doc
Conflicts:
src/gui/kernel/qgesturemanager.cpp
Diffstat (limited to 'src/gui/itemviews/qsortfilterproxymodel.cpp')
0 files changed, 0 insertions, 0 deletions