summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-04-28 21:29:00 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-04-28 21:29:00 (GMT)
commit478d09da8c5c94cfa13a274a3b26e51601f4405d (patch)
treef8cfd3481208cd9ab804aa32fb10baec1836b8f0 /Swiften/Serializer/PayloadSerializers/UnitTest/RosterItemExchangeSerializerTest.cpp
parente31f0e1f42b11eabfd02d5d5759aeef0c0ef72b6 (diff)
parentba6974c89fdbc18e3baedda1c002563ae5dbaf34 (diff)
downloadswift-478d09da8c5c94cfa13a274a3b26e51601f4405d.zip
swift-478d09da8c5c94cfa13a274a3b26e51601f4405d.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Added Galician Swift desktop entry. Disable building of EchoBot example on non-Windows platforms.
Diffstat (limited to 'Swiften/Serializer/PayloadSerializers/UnitTest/RosterItemExchangeSerializerTest.cpp')
0 files changed, 0 insertions, 0 deletions