Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-10-01 07:33:23 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-10-01 07:35:12 (GMT) |
| commit | 4a65cdd952d5d3325c9be6e55e9f33ca5efa0301 (patch) | |
| tree | bb0c67b97b0ee7baeeb2d47793f9d9bc5249762d /Swiften/Avatars/AvatarStorage.cpp | |
| parent | 26e34e9888e4c523741a659055d469c828909cc6 (diff) | |
| parent | eedd35c220d6c8788c8ae4921135333a57feb3a0 (diff) | |
| download | swift-contrib-4a65cdd952d5d3325c9be6e55e9f33ca5efa0301.zip swift-contrib-4a65cdd952d5d3325c9be6e55e9f33ca5efa0301.tar.bz2 | |
Merge branch 'swift-1.x'
* swift-1.x:
Set a title on subscription notification popup.
Don't rely on CCVERSION being present.
Conflicts:
BuildTools/SCons/SConstruct
Diffstat (limited to 'Swiften/Avatars/AvatarStorage.cpp')
0 files changed, 0 insertions, 0 deletions