projects / contrib / qtwebsockets.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea22c84 c98ca12)
Merge remote-tracking branch 'origin/5.3' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 16 Sep 2014 13:29:54 +0000 (15:29 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 16 Sep 2014 13:29:54 +0000 (15:29 +0200)
Conflicts:
.qmake.conf

Change-Id: Ib38d0c86aa010b06b9a201115dfbc9f091abeb0e


Trivial merge
Domain: SCM / Uncategorized;