projects
/
platform
/
upstream
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0462193
7e73dc0
)
Merge remote-tracking branch 'origin/stable' into dev
author
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Tue, 4 Jun 2013 17:43:28 +0000
(19:43 +0200)
committer
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Tue, 4 Jun 2013 17:43:28 +0000
(19:43 +0200)
Conflicts:
.qmake.conf
Change-Id: Ib8b5509c48a686f6e916708d83914e13e4f67e9c
Trivial merge