Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
authorSimon Hausmann <simon.hausmann@nokia.com>
Wed, 30 Sep 2009 12:38:51 +0000 (14:38 +0200)
committerSimon Hausmann <simon.hausmann@nokia.com>
Wed, 30 Sep 2009 12:38:51 +0000 (14:38 +0200)
commit5971b87b4786aeec29a94c4bb77427c9eb823a96
tree03cc616ccb6921b5fcfb3fa45eb539fac6a7be01
parentca2834b0056b301f1d1b732840fcb106fdd477ac
parent343eb73edaa4a05860bf8749a2ff70359f45eb78
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6

Conflicts:
src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp
src/3rdparty/webkit/WebCore/generated/CSSGrammar.h
(merged webkit files with -s ours)
src/sql/drivers/tds/qsql_tds.cpp