Swift
summaryrefslogtreecommitdiffstats
path: root/Swift/QtUI/QtBookmarkDetailWindow.cpp
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-12-15 14:49:30 (GMT)
committerTobias Markmann <tm@ayena.de>2016-12-15 14:49:46 (GMT)
commit6cd7bef6eb507f979d7c964769429ef46e3e5aa9 (patch)
tree322d5c80e7be477758a8e97ecd8a64fbb09836de /Swift/QtUI/QtBookmarkDetailWindow.cpp
parent864904bcd7931ff7453ecb1de72496e4e3cf9c96 (diff)
parent2efefdc5ae847f5d187762e474d75c61560cba19 (diff)
downloadswift-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/QtUI/QtBookmarkDetailWindow.cpp')
0 files changed, 0 insertions, 0 deletions