linuxdcpp-team team mailing list archive

Thread
Date

[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 3340: Merging from main.

To: LinuxDC++ Team <linuxdcpp-team@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Sun, 11 Aug 2013 11:05:43 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Merge authors:
  eMTee (realprogger)
  poy (poy)
------------------------------------------------------------
revno: 3340 [merge]
committer: Fredrik Ullner <ullner@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Sun 2013-08-11 11:42:18 +0200
message:
  Merging from main.
added:
  miniupnpc/minissdpc.c
modified:
  Compile.txt
  SConstruct
  boost/libs/atomic/src/SConscript
  boost/libs/filesystem/src/SConscript
  boost/libs/regex/src/SConscript
  boost/libs/system/src/SConscript
  build_util.py
  changelog.txt
  dcpp/Archive.cpp
  dcpp/BZUtils.cpp
  dcpp/BZUtils.h
  dcpp/File.cpp
  dcpp/File.h
  dcpp/FileReader.cpp
  dcpp/GeoIP.cpp
  dcpp/Mapper_NATPMP.cpp
  dcpp/QueueManager.cpp
  dcpp/SConscript
  dcpp/Socket.cpp
  dcpp/Thread.h
  dcpp/Util.h
  dcpp/ZUtils.cpp
  dcpp/compiler.h
  dcpp/format.h
  dwarf/SConscript
  dwarf/config.h
  dwt/src/SConscript
  dwt/src/util/SConscript
  dwt/src/util/win32/SConscript
  dwt/src/widgets/SConscript
  dwt/test/SConscript
  geoip/SConscript
  help/links.html
  intl/SConscript
  miniupnpc/miniupnpcstrings.h
  test/SConscript
  test/testtext.cpp
  utils/SConscript
  utils/portmap.cpp
  utils/xsum.cpp
  win32/MainWindow.cpp
  win32/MainWindow.h
  win32/PluginPage.cpp
  win32/SConscript
  win32/TransferView.cpp
  zlib/SConscript
The size of the diff (1686 lines) is larger than your specified limit of 1000 lines

--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription