Merge branch '4.5' into 4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Fri, 4 Sep 2009 08:24:39 +0000 (10:24 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Fri, 4 Sep 2009 08:24:39 +0000 (10:24 +0200)
commit92a3662564f421a46761989d153f6c8eb990131f
tree63910a248879fb2b4007450fed01f37626355bbb
parent2e1653563a801909788c912ed8071afe8bf4ba05
parentd22b55d3159c001dc6b37422cefbec6775996494
Merge branch '4.5' into 4.6
src/gui/dialogs/qfiledialog_embedded.ui
src/gui/painting/qpaintengine_mac.cpp
tools/linguist/lrelease/lrelease.1
util/local_database/qlocalexml2cpp.py
util/scripts/make_qfeatures_dot_h