summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-03-17 09:49:10 +0100
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-03-17 09:49:10 +0100
commit2348cac4fa6baab447a21286ac8680ad6829008f (patch)
tree2d2561fba0a43d1fab4499c971e66f21000ea2cf /README.md
parent15627cc2232bf155d892b630b7e0cb04ce6bbe67 (diff)
parent8a370cead2f493ee961c814af96192a8db3e18e3 (diff)
downloadqtwebsockets-2348cac4fa6baab447a21286ac8680ad6829008f.tar.gz
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I3dec06c8b49480a8225ef3487c4c76a4fa05b01c
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions