Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-12-15 14:49:30 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-12-15 14:49:46 (GMT) |
| commit | 6cd7bef6eb507f979d7c964769429ef46e3e5aa9 (patch) | |
| tree | 322d5c80e7be477758a8e97ecd8a64fbb09836de /Swift/Packaging/Debian/debian/binary-overrides/swift-im | |
| parent | 864904bcd7931ff7453ecb1de72496e4e3cf9c96 (diff) | |
| parent | 2efefdc5ae847f5d187762e474d75c61560cba19 (diff) | |
| download | swift-6cd7bef6eb507f979d7c964769429ef46e3e5aa9.zip swift-6cd7bef6eb507f979d7c964769429ef46e3e5aa9.tar.bz2 | |
Merge branch 'swift-3.x’
* swift-3.x:
- Fix building Swift on 32-bit Linux distributions
- Remove optional_fwd.hpp use; workaround for Boost Bug #12179
- Split COPYING.thirdparty in contributions/dependencies
- Fixes for building packages on Debian
Conflicts:
BuildTools/SCons/SConstruct
Sluift/Console.h
Sluift/ITunesInterface.h
Sluift/Terminal.h
Swift/Packaging/Debian/debian/control.in
Swift/QtUI/SConscript
Swiften/Elements/Stanza.h
Swiften/FileTransfer/FileTransferTransporter.h
Swiften/FileTransfer/IBBReceiveSession.h
Swiften/JID/JID.h
Swiften/Network/BoostConnectionServer.h
Swiften/Network/ConnectionServer.h
Swiften/Parser/AttributeMap.h
Test-Information:
Builds on macOS 10.12.1 with clang trunk.
Change-Id: I9f41ab199f227bc106721627ea994313c68e5cfe
Diffstat (limited to 'Swift/Packaging/Debian/debian/binary-overrides/swift-im')
| -rw-r--r-- | Swift/Packaging/Debian/debian/binary-overrides/swift-im | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Swift/Packaging/Debian/debian/binary-overrides/swift-im b/Swift/Packaging/Debian/debian/binary-overrides/swift-im deleted file mode 100644 index 11ca729..0000000 --- a/Swift/Packaging/Debian/debian/binary-overrides/swift-im +++ /dev/null @@ -1,2 +0,0 @@ -# The upstream numbering scheme is that 2.0~beta1 is prior to 2.0 but that 2.0~beta1+dev10 is ten commits later than 2.0~beta1, so in this case the warning is redundant. -swift-im binary: rc-version-greater-than-expected-version |