diff options
author | Remko Tronçon <git@el-tramo.be> | 2011-04-29 21:36:05 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2011-04-29 21:36:05 (GMT) |
commit | fa41e2adea4ddbb2eb0d05cbfa0dec7e290d55d5 (patch) | |
tree | cb23841b9c569acc513c9e0971f775365c48b7ae /Swift/QtUI/MUCSearch/MUCSearchDelegate.cpp | |
parent | 0ad85cdec57d49b697215103cc73463eacc76eb5 (diff) | |
parent | 27042edc19e393b24e7953c668a7cec820b710d8 (diff) | |
download | swift-contrib-fa41e2adea4ddbb2eb0d05cbfa0dec7e290d55d5.zip swift-contrib-fa41e2adea4ddbb2eb0d05cbfa0dec7e290d55d5.tar.bz2 |
Merge branch 'swift-1.x'
* swift-1.x:
Build Swiften as a DLL in Debian package.
Added versioning to Swiften.
Conflicts:
BuildTools/Copyrighter.py
Diffstat (limited to 'Swift/QtUI/MUCSearch/MUCSearchDelegate.cpp')
0 files changed, 0 insertions, 0 deletions