summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code/src_network_ssl_qsslsocket.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-25 22:17:14 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-25 22:17:14 (GMT)
commit2dd38c17741536c85ed24536addcee8a7b12fe50 (patch)
tree3584a65ca917327fbab66bb096f4b1b7de354188 /doc/src/snippets/code/src_network_ssl_qsslsocket.cpp
parent039b057b95db7687867904e1a9a5046a8e3b3fc0 (diff)
parent7c36400a998b6d4cff34d7cb783f8e228a3e3621 (diff)
downloadQt-2dd38c17741536c85ed24536addcee8a7b12fe50.zip
Qt-2dd38c17741536c85ed24536addcee8a7b12fe50.tar.gz
Qt-2dd38c17741536c85ed24536addcee8a7b12fe50.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix OpenVG build on non-Symbian platforms.
Diffstat (limited to 'doc/src/snippets/code/src_network_ssl_qsslsocket.cpp')
0 files changed, 0 insertions, 0 deletions
mitgraph'> * | | Fix typo noticed by Alec NunnBerker Peksag2015-10-311-1/+1 |\ \ \ | |/ / | * | Fix typo noticed by Alec NunnBerker Peksag2015-10-311-1/+1 * | | Merge from 3.5Steve Dower2015-10-3117-67/+103 |\ \ \ | |/ / | * | Issue #25450: Updates shortcuts to start Python in installation directory.Steve Dower2015-10-314-4/+10 | * | Improves handling of test markers for building Python without intefering with...Steve Dower2015-10-3113-63/+93 * | | Merge 3.5Yury Selivanov2015-10-311-1/+1 |\ \ \ | |/ / | * | whatsnew/3.5: NumPy 1.10 has been releasedYury Selivanov2015-10-311-1/+1 * | | Merge 3.5Yury Selivanov2015-10-311-0/+6 |\ \ \ | |/ / | * | docs/inspect: Document __annotations__Yury Selivanov2015-10-311-0/+6 * | | Merge typo fixes from 3.5Martin Panter2015-10-317-10/+10 |\ \ \ | |/ / | * | Fix more typos in whatsnew/3.5.rstMartin Panter2015-10-311-4/+4 | * | Merge spelling fixes from 3.4 into 3.5Martin Panter2015-10-316-6/+6 | |\ \ | | |/ | | * Fix some spelling errors in documentation and code commentsMartin Panter2015-10-316-6/+6 * | | Merge with 3.5Terry Jan Reedy2015-10-301-2/+2 |\ \ \ | |/ / | * | Merge with 3.4Terry Jan Reedy2015-10-301-2/+2 | |\ \ | | |/ | | * Issue #25519: Mark difflib.ndiff as a functions where not already.Terry Jan Reedy2015-10-301-2/+2 * | | Merge with 3.5Terry Jan Reedy2015-10-301-2/+0 |\ \ \ | |/ / | * | Merge with 3.4Terry Jan Reedy2015-10-301-2/+0 | |\ \ | | |/ | | * Issue #25505: Remove unused buggy method.Terry Jan Reedy2015-10-301-2/+0 * | | Issue #25487: Fix tests not updated when the imp module moved to aBrett Cannon2015-10-30