summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2011-10-01Merge branch 'swift-1.x'Remko Tronçon
* swift-1.x: Set a title on subscription notification popup. Don't rely on CCVERSION being present. Conflicts: BuildTools/SCons/SConstruct
2011-09-25File transfer changes.Remko Tronçon
- Introduce 'experimental' flag to conditionally compile FT. - Use LibMiniUPNPC and NATPMP CPPDEFINES only locally in the classes that need them. - Extract abstract interface from NAT traversal classes - Avoid unit test warnings
2011-09-25Google Summer of Code 2011 Project: Adding support for Jingle File Transfers ↵Tobias Markmann
(XEP-0234), Jingle SOCKS5 Bytestreams Transport Method (XEP-0260), Jingle In-Band Bytestreams Transport Method (XEP-0261) and SOCKS5 Bytestreams (XEP-0065). License: This patch is BSD-licensed, see http://www.opensource.org/licenses/bsd-license.php
2011-07-10Fixed compilation problem on some compilers.Remko Tronçon
2011-07-10Added enable_variants build option.Remko Tronçon
2010-03-28Removing submodules.Remko Tronçon
2010-03-28Moved BuildTools to a separate module.Remko Tronçon