projects
/
profile
/
ivi
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
29017e8
1397048
)
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
author
Alan Alpert
<alan.alpert@nokia.com>
Thu, 19 May 2011 08:43:59 +0000
(18:43 +1000)
committer
Alan Alpert
<alan.alpert@nokia.com>
Thu, 19 May 2011 08:43:59 +0000
(18:43 +1000)
1
2
src/declarative/qml/qdeclarativeengine.cpp
patch
|
diff1
|
diff2
|
blob
|
history
tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/declarative/qml/qdeclarativeengine.cpp
Simple merge
diff --cc
tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
Simple merge
projects / profile / ivi / qtdeclarative.git / commitdiff