projects
/
konrad/qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
124b711
1cf2984
)
Merge branch 'master' into qtquick2
author
Aaron Kennedy
<aaron.kennedy@nokia.com>
Thu, 9 Jun 2011 04:45:59 +0000 (14:45 +1000)
committer
Aaron Kennedy
<aaron.kennedy@nokia.com>
Thu, 9 Jun 2011 04:45:59 +0000 (14:45 +1000)
Conflicts:
src/declarative/qml/qdeclarativeengine.cpp
1
2
demos/declarative/flickr/flickr.qml
patch
|
diff1
|
diff2
|
blob
|
history
demos/declarative/minehunt/MinehuntCore/Explosion.qml
patch
|
diff1
|
diff2
|
blob
|
history
demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
patch
|
diff1
|
diff2
|
blob
|
history
demos/declarative/samegame/SamegameCore/BoomBlock.qml
patch
|
diff1
|
diff2
|
blob
|
history
demos/declarative/samegame/samegame.qml
patch
|
diff1
|
diff2
|
blob
|
history
demos/declarative/snake/content/Cookie.qml
patch
|
diff1
|
diff2
|
blob
|
history
demos/declarative/snake/content/Link.qml
patch
|
diff1
|
diff2
|
blob
|
history
src/declarative/declarative.pro
patch
|
diff1
|
diff2
|
blob
|
history
src/declarative/qml/qdeclarativeengine.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/declarative/util/qdeclarativepixmapcache.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
demos/declarative/flickr/flickr.qml
Simple merge
diff --cc
demos/declarative/minehunt/MinehuntCore/Explosion.qml
Simple merge
diff --cc
demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
Simple merge
diff --cc
demos/declarative/samegame/SamegameCore/BoomBlock.qml
Simple merge
diff --cc
demos/declarative/samegame/samegame.qml
Simple merge
diff --cc
demos/declarative/snake/content/Cookie.qml
Simple merge
diff --cc
demos/declarative/snake/content/Link.qml
Simple merge
diff --cc
src/declarative/declarative.pro
Simple merge
diff --cc
src/declarative/qml/qdeclarativeengine.cpp
Simple merge
diff --cc
src/declarative/util/qdeclarativepixmapcache.cpp
Simple merge