summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-18 16:34:04 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-18 16:34:04 (GMT)
commitc31ab7f87ea33b4e1de2ae28c3c9e5263de23b77 (patch)
treed849f6bf26774e08601c860801a815bdf31c5bfe /.settings
parented0dbffeb8a3b36965d359c8a689bdb41372e481 (diff)
parent7d0e9c3d963ffcb3f7d6d313dfa55466beb742b9 (diff)
downloadswift-c31ab7f87ea33b4e1de2ae28c3c9e5263de23b77.zip
swift-c31ab7f87ea33b4e1de2ae28c3c9e5263de23b77.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Small tweaks to the previous patch. Added ConnectionServerFactory. Conflicts: Swiften/Network/SConscript
Diffstat (limited to '.settings')
0 files changed, 0 insertions, 0 deletions