projects / konrad/qtdeclarative.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0c8deb 3e3b570)
Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 22 Apr 2013 14:36:57 +0000 (16:36 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 22 Apr 2013 14:36:57 +0000 (16:36 +0200)
Change-Id: I8b0be891402530e38efca46f7cbb679eca5d4a9d

1  2 
src/particles/qquickimageparticle.cpp patch | diff1 | diff2 | blob | history

diff --cc src/particles/qquickimageparticle.cpp
Simple merge
Unnamed repository; edit this file 'description' to name the repository.