summaryrefslogtreecommitdiffstats
path: root/dist/changes-3.0.4
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-04-20 07:23:43 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-04-20 07:23:43 (GMT)
commit67926b8e4d9e7463597ef113944d78ca326fd9ae (patch)
treee24fa54e245a8c3b27cd1f740aaf5d296e05621b /dist/changes-3.0.4
parent2c762f3b8b284a7c6dc0c499b7052013bad5b707 (diff)
parent10194aafd10824fe1919aa44083224e8bea442ca (diff)
downloadQt-67926b8e4d9e7463597ef113944d78ca326fd9ae.zip
Qt-67926b8e4d9e7463597ef113944d78ca326fd9ae.tar.gz
Qt-67926b8e4d9e7463597ef113944d78ca326fd9ae.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts: src/gui/itemviews/qheaderview_p.h
Diffstat (limited to 'dist/changes-3.0.4')
0 files changed, 0 insertions, 0 deletions