Public Git Hosting - qt-netbsd.git/commit

commit	d9ab330f613bd2c921ba00ed36b6eea8927aec80
author	Thiago Macieira <thiago.macieira@nokia.com>
	Fri, 22 May 2009 16:50:30 +0000 (22 18:50 +0200)
committer	Thiago Macieira <thiago.macieira@nokia.com>
	Fri, 22 May 2009 16:50:30 +0000 (22 18:50 +0200)
tree	8a5337dac7617fe8e654fd4ffd1302c587967c76	tree \| snapshot (tar.gz zip)
parent	dacc8cb0b2abd5ec3e9603c9bcf5b8f489639404	commit \| diff
parent	701bdcbc8b7751834f6d24844bcb91a23cbdc409	commit \| diff

Merge branch '4.5'

Conflicts:
src/corelib/kernel/qsharedmemory_unix.cpp

src/corelib/io/qfile.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfsfileengine_unix.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfsfileengine_win.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qsharedmemory_unix.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qhttp.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qfile/tst_qfile.cpp	diff1 \|	diff2 \|	blob \| history