projects
/
contrib
/
qtwebsockets.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8b9836d
6419556
)
Merge remote-tracking branch 'origin/release' into stable
author
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Wed, 14 May 2014 10:40:46 +0000
(12:40 +0200)
committer
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Wed, 14 May 2014 10:40:46 +0000
(12:40 +0200)
Change-Id: I9de811ee1f43381b6ce27acd47a126a70fd10d46
Trivial merge