Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-04-28 21:29:00 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-04-28 21:29:00 (GMT) |
| commit | 478d09da8c5c94cfa13a274a3b26e51601f4405d (patch) | |
| tree | f8cfd3481208cd9ab804aa32fb10baec1836b8f0 /Swiften/Avatars/CombinedAvatarProvider.cpp | |
| parent | e31f0e1f42b11eabfd02d5d5759aeef0c0ef72b6 (diff) | |
| parent | ba6974c89fdbc18e3baedda1c002563ae5dbaf34 (diff) | |
| download | swift-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/Avatars/CombinedAvatarProvider.cpp')
0 files changed, 0 insertions, 0 deletions