diff options
author | Remko Tronçon <git@el-tramo.be> | 2011-06-18 22:09:38 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2011-06-18 22:09:38 (GMT) |
commit | a23b90319f9de8db0b455f5cd56e2428a3fcc53b (patch) | |
tree | 95d5baed116136cc214d8e1b5c49136b4abded5f /Swiften/Elements/Presence.h | |
parent | ce4eb88be2eba12d5580bb22b48af3a0e915363b (diff) | |
parent | 5b88d16b2ea7edfbc1487751fb95f128b2c30330 (diff) | |
download | swift-contrib-a23b90319f9de8db0b455f5cd56e2428a3fcc53b.zip swift-contrib-a23b90319f9de8db0b455f5cd56e2428a3fcc53b.tar.bz2 |
Merge branch 'swift-1.x'
* swift-1.x:
Fixed Debian manpages installation.
Use LibXML as a Debian source dependency (instead of Expat)
Tweak help documentation and add manpages.
Conflicts:
Swift/QtUI/QtSwift.cpp
Diffstat (limited to 'Swiften/Elements/Presence.h')
0 files changed, 0 insertions, 0 deletions