projects
/
konrad/qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6f411ef
4348452
)
Merge remote-tracking branch 'origin/stable' into dev
author
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Tue, 28 May 2013 13:24:18 +0000 (15:24 +0200)
committer
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Tue, 28 May 2013 13:35:03 +0000 (15:35 +0200)
Conflicts:
src/quick/doc/src/appdevguide/porting.qdoc
sync.profile
Change-Id: Iec5516c596c3eca60a3e6ceb1d45f2a7a1595c12
1
2
src/qml/qml/qqmlengine.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/qml/qml/qqmlimport.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/quick/scenegraph/coreapi/qsgnode.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/quick/util/qquickimageprovider.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/qml/qml/qqmlengine.cpp
Simple merge
diff --cc
src/qml/qml/qqmlimport.cpp
Simple merge
diff --cc
src/quick/scenegraph/coreapi/qsgnode.cpp
Simple merge
diff --cc
src/quick/util/qquickimageprovider.cpp
Simple merge