projects
/
profile
/
ivi
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ca31cbf
b0183be
)
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
author
Gunnar Sletta
<gunnar.sletta@nokia.com>
Wed, 15 Jun 2011 13:47:32 +0000
(15:47 +0200)
committer
Gunnar Sletta
<gunnar.sletta@nokia.com>
Wed, 15 Jun 2011 13:47:32 +0000
(15:47 +0200)
1
2
src/declarative/items/qsgshadereffectmesh.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/declarative/items/qsgshadereffectmesh.cpp
Simple merge
projects / profile / ivi / qtdeclarative.git / commitdiff