projects
/
platform
/
upstream
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5ba070d
6ccb9f8
)
Merge remote-tracking branch 'origin/release' into stable
author
Simon Hausmann
<simon.hausmann@digia.com>
Thu, 16 Jan 2014 20:52:48 +0000
(21:52 +0100)
committer
Simon Hausmann
<simon.hausmann@digia.com>
Thu, 16 Jan 2014 20:53:57 +0000
(21:53 +0100)
Change-Id: Id18709cb0a4d85ffdadffa28aef98323367292d4
1
2
src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
Simple merge