projects
/
platform
/
upstream
/
qtmultimedia.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b0481d4
da89319
)
Merge remote-tracking branch 'origin/stable' into dev
author
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Fri, 10 Jan 2014 17:30:14 +0000
(18:30 +0100)
committer
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Fri, 10 Jan 2014 17:30:14 +0000
(18:30 +0100)
Change-Id: I7dc36a224702721b67ffa2cf7f9ce2a6b047f88e
Trivial merge