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

projects / qt:qt.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6088336 48e08ee)

author	Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
	Wed, 13 Jan 2010 10:39:21 +0000 (11:39 +0100)
committer	Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
	Wed, 13 Jan 2010 10:39:21 +0000 (11:39 +0100)
commit	3aca005d4721b82446922310496271ebe206a0d7
tree	f71298b19bd98c6b3751bc9009b2fdb49c2ad526	tree \| snapshot
parent	6088336d9237eaa94def8c2a83901b547e682abb	commit \| diff
parent	48e08ee5718b3de855ecea626179ad5323e38fa0	commit \| diff

Merge remote branch 'mainline/4.6' into 4.6

Conflicts:
tests/auto/linguist/lupdate/testlupdate.cpp

14 files changed:

doc/src/examples/moveblocks.qdoc	diff1 \|	diff2 \|	blob \| history
examples/animation/moveblocks/main.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qs60style.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qs60style_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qs60style_s60.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qs60style_simulated.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/linguist/lupdate/testdata/good/heuristics/main.cpp	diff1 \|	\|	blob \| history
tests/auto/linguist/lupdate/testdata/good/reloutput/main.cpp	diff1 \|	\|	blob \| history
tests/auto/linguist/lupdate/tst_lupdate.cpp	diff1 \|	diff2 \|	blob \| history
tools/linguist/lupdate/cpp.cpp	diff1 \|	diff2 \|	blob \| history
tools/linguist/lupdate/main.cpp	diff1 \|	diff2 \|	blob \| history
tools/linguist/lupdate/merge.cpp	diff1 \|	diff2 \|	blob \| history
tools/linguist/shared/translator.cpp	diff1 \|	diff2 \|	blob \| history
translations/qt_de.ts	diff1 \|	diff2 \|	blob \| history

6b46b7419a5aee9bd5fce67b7bfa8afe8e