summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-03-28 13:36:48 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-03-28 13:36:48 (GMT)
commitdae28dd45e43fc6e6ef2ec4c6c65d5d736ed86f8 (patch)
treef01fe3ff891a815b7c7db511ddbabcc67f916445 /Swiften/LinkLocal/DNSSD
parenta7d213975040a1130ac136d61a055c5b6f5d41fa (diff)
parenta59af6c6daa72dd491189335cf2d255a788eb0f6 (diff)
downloadswift-dae28dd45e43fc6e6ef2ec4c6c65d5d736ed86f8.zip
swift-dae28dd45e43fc6e6ef2ec4c6c65d5d736ed86f8.tar.bz2
Merge commit 'origin/master'
Conflicts: BuildTools
Diffstat (limited to 'Swiften/LinkLocal/DNSSD')
0 files changed, 0 insertions, 0 deletions