projects / contrib / qtwebsockets.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 717ba7e 00f77bd)
Merge remote-tracking branch 'origin/5.3' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 26 Jun 2014 15:29:10 +0000 (17:29 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 26 Jun 2014 15:29:10 +0000 (17:29 +0200)
Conflicts:
.qmake.conf

Change-Id: Idce64ab613c4e07ffb38cac4115690b885f110f2

1  2 
src/websockets/qwebsocket_p.cpp patch | diff1 | diff2 | blob | history

diff --cc src/websockets/qwebsocket_p.cpp
Simple merge
Domain: SCM / Uncategorized;