Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-06-01 21:12:49 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-06-01 21:14:01 (GMT) |
| commit | 8189054fca9c68194ffc328eb7beecf241bbbcd7 (patch) | |
| tree | 4751ada9d52a529b62c8e911c61ba6306744cd94 /Swiften/EventLoop/Cocoa/CocoaEventLoop.mm | |
| parent | 1bea8e06b44d1d71d2c3d461b7a98f28835d64bf (diff) | |
| parent | 9928be64a4c19f497302963d23ed0efc66b899c0 (diff) | |
| download | swift-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/EventLoop/Cocoa/CocoaEventLoop.mm')
0 files changed, 0 insertions, 0 deletions