projects
/
platform
/
upstream
/
qtmultimedia.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
967e0eb
a0df6c3
)
Merge remote-tracking branch 'origin/stable' into dev
author
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Mon, 23 Dec 2013 14:37:30 +0000
(15:37 +0100)
committer
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Mon, 23 Dec 2013 14:37:31 +0000
(15:37 +0100)
Change-Id: I0429a7186bef08918b777d6aa662685c57bad091
Trivial merge