projects
/
platform
/
upstream
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2d065dd
7320f61
)
Merge remote-tracking branch 'origin/stable' into dev
author
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Mon, 24 Jun 2013 20:37:33 +0000
(22:37 +0200)
committer
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Mon, 24 Jun 2013 20:37:33 +0000
(22:37 +0200)
Change-Id: I444ed90a02eebe1f68cfa48be5d75544123ab10d
1
2
src/quick/items/context2d/qquickcontext2d.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/quick/items/context2d/qquickcontext2d.cpp
Simple merge