diff options
author | Remko Tronçon <git@el-tramo.be> | 2011-04-27 16:53:25 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2011-04-27 16:53:25 (GMT) |
commit | 736e98062eb2fed1a7b827cd852d2da76aa31189 (patch) | |
tree | 13527f0a839de6f1871594e3f83be31f88c332f8 /Swiften/Serializer/PayloadSerializers/DelaySerializer.cpp | |
parent | 6f30d20883b303f3bd536b2d8164963d61b9897a (diff) | |
parent | 4e25c7acd22515368575e2673d921832b99c32fa (diff) | |
download | swift-736e98062eb2fed1a7b827cd852d2da76aa31189.zip swift-736e98062eb2fed1a7b827cd852d2da76aa31189.tar.bz2 |
Merge branch 'swift-1.x'
* swift-1.x:
Keep shared_ptr of PlatformDomainNameServiceQuery in event loop.
Renamed Swedish translation file to swift_sv.
Diffstat (limited to 'Swiften/Serializer/PayloadSerializers/DelaySerializer.cpp')
0 files changed, 0 insertions, 0 deletions