projects
/
platform
/
upstream
/
qtmultimedia.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
16aadf9
88ef2bf
)
Merge remote-tracking branch 'origin/stable' into dev
author
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 16:20:59 +0000
(17:20 +0100)
committer
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 16:20:59 +0000
(17:20 +0100)
Conflicts:
.qmake.conf
Change-Id: Id367a610a3aefd288bfe287a3bf64606e582deb9
Trivial merge