projects
/
contrib
/
qtwebsockets.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0c35647
eb16b19
)
Merge remote-tracking branch 'origin/5.3' into dev
author
Sergio Ahumada
<sahumada@blackberry.com>
Sat, 14 Jun 2014 19:51:30 +0000
(21:51 +0200)
committer
Sergio Ahumada
<sahumada@blackberry.com>
Sat, 14 Jun 2014 19:51:30 +0000
(21:51 +0200)
Conflicts:
.qmake.conf
Change-Id: I8ef1da19810c1bf4d68bf157848bccb5446669cc
Trivial merge