projects
/
konrad/qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4d3a64c
7726da2
)
Merge remote-tracking branch 'origin/stable' into dev
author
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Mon, 18 Feb 2013 15:07:54 +0000 (16:07 +0100)
committer
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Mon, 18 Feb 2013 15:07:55 +0000 (16:07 +0100)
Change-Id: I33db683ebf12248b2ed14eeaf65c4bcade14bfbf
1
2
src/quick/designer/designersupport.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/quick/items/qquickrepeater.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/quick/items/qquickwindow.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/quick/scenegraph/util/qsgpainternode.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/quick/designer/designersupport.cpp
Simple merge
diff --cc
src/quick/items/qquickrepeater.cpp
Simple merge
diff --cc
src/quick/items/qquickwindow.cpp
Simple merge
diff --cc
src/quick/scenegraph/util/qsgpainternode.cpp
Simple merge