summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-01 21:12:49 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-01 21:14:01 (GMT)
commit8189054fca9c68194ffc328eb7beecf241bbbcd7 (patch)
tree4751ada9d52a529b62c8e911c61ba6306744cd94 /Swiften/LinkLocal/LinkLocalConnector.cpp
parent1bea8e06b44d1d71d2c3d461b7a98f28835d64bf (diff)
parent9928be64a4c19f497302963d23ed0efc66b899c0 (diff)
downloadswift-8189054fca9c68194ffc328eb7beecf241bbbcd7.zip
swift-8189054fca9c68194ffc328eb7beecf241bbbcd7.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Added fix for a billion laughs attack on Expat. Conflicts: Swiften/Parser/LibXMLParser.cpp Swiften/Parser/UnitTest/XMLParserTest.cpp
Diffstat (limited to 'Swiften/LinkLocal/LinkLocalConnector.cpp')
0 files changed, 0 insertions, 0 deletions