summaryrefslogtreecommitdiffstats
path: root/src/network/socket/qsocks5socketengine.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master'Jason Barron2009-08-131-1/+1
|\
| * Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
* | Merge commit 'qt/master-stable'Jason Barron2009-07-271-3/+17
|\ \ | |/
| * Sockets: Added support for SO_KEEPALIVE and TCP_NODELAYMarkus Goetz2009-07-231-3/+17
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-2/+2
|\ \ | |/
| * Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
| |\
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
| | * Long live Qt 4.5!Lars Knoll2009-03-231-0/+1850
* | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-7/+7
|\ \ | |/
| * improved string operations all over the placeThierry Bastian2009-05-281-7/+7
| * Long live Qt!Lars Knoll2009-03-231-0/+1850
* Make Qt exception safer.Robert Griebl2009-06-101-2/+2
* Long live Qt for S60!axis2009-04-241-0/+1854