gitorious.org Git - qt:qt.git/commit

projects / qt:qt.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c40ae86 9c13245)

author	axis <qt-info@nokia.com>
	Mon, 31 Jan 2011 11:37:19 +0000 (12:37 +0100)
committer	axis <qt-info@nokia.com>
	Mon, 31 Jan 2011 11:37:19 +0000 (12:37 +0100)
commit	5cd39cd8a70be4c22164fe060ad64a1d9108bf41
tree	4b072c7d4e4d717fe8f0977dd2108837ac71f7c3	tree \| snapshot
parent	c40ae86025856225e74289249ecc509bf61dc9ba	commit \| diff
parent	9c132451acc7fbed1611fd3676cceb26e815f50d	commit \| diff

Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master

18 files changed:

doc/src/development/qmake-manual.qdoc	diff1 \|	diff2 \|	blob \| history
doc/src/snippets/code/doc_src_qmake-manual.qdoc	diff1 \|	diff2 \|	blob \| history
mkspecs/common/symbian/symbian-makefile.conf	diff1 \|	diff2 \|	blob \| history
mkspecs/common/symbian/symbian.conf	diff1 \|	diff2 \|	blob \| history
mkspecs/win32-g++/qmake.conf	diff1 \|	diff2 \|	blob \| history
qmake/generators/metamakefile.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/symbian/symbiancommon.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/win32/mingw_make.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/win32/mingw_make.h	diff1 \|	diff2 \|	blob \| history
qmake/generators/win32/winmakefile.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/win32/winmakefile.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfilesystemengine.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qobject.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qapplication_s60.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qkeymapper_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qkeymapper_s60.cpp	diff1 \|	diff2 \|	blob \| history
src/network/kernel/qnetworkinterface_symbian.cpp	diff1 \|	diff2 \|	blob \| history
tools/runonphone/main.cpp	diff1 \|	diff2 \|	blob \| history

6b46b7419a5aee9bd5fce67b7bfa8afe8e