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

Change-Id: I8ef1da19810c1bf4d68bf157848bccb5446669cc


Trivial merge
Domain: SCM / Uncategorized;