projects / contrib / qtwebsockets.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e677361 d4ac9f5)
Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sahumada@blackberry.com>
Thu, 13 Mar 2014 13:50:03 +0000 (14:50 +0100)
committerSergio Ahumada <sahumada@blackberry.com>
Thu, 13 Mar 2014 13:50:05 +0000 (14:50 +0100)
Change-Id: I0ee590f834200c488498315e66acf7cd046d43ad


Trivial merge
Domain: SCM / Uncategorized;