projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 95b17fb 21b357d)
Merge remote-tracking branch 'origin/4.6' into qt-4.7-from-4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Tue, 8 Mar 2011 07:36:10 +0000 (08:36 +0100)
committerThiago Macieira <thiago.macieira@nokia.com>
Tue, 8 Mar 2011 07:36:10 +0000 (08:36 +0100)
commitf23f25e576e05a8f6a37930310e2af82b5d4b196
treea70482b00267d8703395d4331b7166a992395cc8tree | snapshot
parent95b17fbe91eb3b1b0fcac92d8a8934769e4cd847commit | diff
parent21b357d4e11eee2374d08a70706ced2f964fc5c6commit | diff
Merge remote-tracking branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
mkspecs/features/qttest_p4.prf
src/script/utils/qscriptdate.cpp
src/script/utils/qscriptdate_p.h
tests/auto/qscriptvalue/testgen/testgenerator.cpp
tests/auto/qscriptvalue/tst_qscriptvalue_generated.cpp
src/network/bearer/qsharednetworksession.cpp diff1 | | blob | history
tools/qmeegographicssystemhelper/qmeegoswitchevent.cpp diff1 | | blob | history
6b46b7419a5aee9bd5fce67b7bfa8afe8e