Public Git Hosting - qt-netbsd.git/commit

commit	88fd79fc3a52ef6d3649579879a72a8badc3fb4b
author	Simon Hausmann <simon.hausmann@nokia.com>
	Tue, 24 Mar 2009 15:50:57 +0000 (24 16:50 +0100)
committer	Simon Hausmann <simon.hausmann@nokia.com>
	Tue, 24 Mar 2009 15:50:57 +0000 (24 16:50 +0100)
tree	6094abae88cab3efbe2a0eb02a63730e5e7e1686	tree \| snapshot (tar.gz zip)
parent	f5caf1998dea7dbad25dc6aed5a00fc33e8a5818	commit \| diff
parent	e18eac95ad4b69ebe53e51c65416f1c94275e10a	commit \| diff

Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

doc/src/designer-manual.qdoc	diff1 \|	diff2 \|	blob \| history
src/corelib/global/qglobal.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qpixmap_x11.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qpixmapdata_p.h	diff1 \|	diff2 \|	blob \| history
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qpixmap/tst_qpixmap.cpp	diff1 \|	diff2 \|	blob \| history