From 23c95e35a0b3d35f932e680660e8ca83697662ab Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Mon, 12 Mar 2007 01:05:15 +0000 Subject: [PATCH] merged fixes from RC_0_12 branch --- ChangeLog | 1 - Makefile.am | 30 +++++++++++++++++++++++++++++- docs/Linkage.jpg | Bin 0 -> 6151 bytes docs/projects.html | 8 +++++++- docs/projects.rst | 5 +++++ src/identify_client.cpp | 1 + 6 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 docs/Linkage.jpg diff --git a/ChangeLog b/ChangeLog index 9da4950f9..adc67c55f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,7 +33,6 @@ release 0.12 * Added support for uT peer exchange extension, implemented by Massaroddel. * Modified the quota management to offer better bandwidth balancing between peers. - * added XCode project files (maintained by Gregor Riepl) * logging now supports multiple sessions (different sessions now log to different directories). * fixed random number generator seed problem, generating the same diff --git a/Makefile.am b/Makefile.am index bcfcc4eb2..6a5a0d86e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,35 @@ docs/ubuntu_build_notes.rst \ docs/udp_tracker_protocol.html docs/client_test.rst docs/client_test.html \ docs/unicode_support.png docs/client_test.png docs/style.css Jamfile project-root.jam \ m4/ac_cxx_namespaces.m4 m4/acx_pthread.m4 m4/ax_boost_date-time.m4 \ -m4/ax_boost_filesystem.m4 m4/ax_boost_thread.m4 src/file_win.cpp libtorrent.pc +m4/ax_boost_filesystem.m4 m4/ax_boost_thread.m4 src/file_win.cpp libtorrent.pc \ +bindings/README.txt \ +bindings/python/Jamfile \ +bindings/python/client.py \ +bindings/python/simple_client.py \ +bindings/python/src/alert.cpp \ +bindings/python/src/big_number.cpp \ +bindings/python/src/converters.cpp \ +bindings/python/src/datetime.cpp \ +bindings/python/src/docstrings.cpp \ +bindings/python/src/entry.cpp \ +bindings/python/src/extensions.cpp \ +bindings/python/src/filesystem.cpp \ +bindings/python/src/fingerprint.cpp \ +bindings/python/src/gil.hpp \ +bindings/python/src/module.cpp \ +bindings/python/src/optional.hpp \ +bindings/python/src/peer_info.cpp \ +bindings/python/src/peer_plugin.cpp \ +bindings/python/src/session.cpp \ +bindings/python/src/session_settings.cpp \ +bindings/python/src/torrent.cpp \ +bindings/python/src/torrent_handle.cpp \ +bindings/python/src/torrent_info.cpp \ +bindings/python/src/torrent_status.cpp \ +bindings/python/src/utility.cpp \ +bindings/python/src/version.cpp + + pkginclude_HEADER = \ debian/changelog \ diff --git a/docs/Linkage.jpg b/docs/Linkage.jpg new file mode 100644 index 0000000000000000000000000000000000000000..9a79d4f07569e098ca07f4675aba75b88e28980c GIT binary patch literal 6151 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 bnk-xT*IWh7i|vVAcz?0J$eQa`yqx_n-jQtS literal 0 HcmV?d00001 diff --git a/docs/projects.html b/docs/projects.html index 834ecc6fe..be9d06c34 100644 --- a/docs/projects.html +++ b/docs/projects.html @@ -46,7 +46,7 @@ connects to the daemon. One GUI (ncurses) and one web interface (accessable through a web browser). Written by Michael Wojciechowski -and Johan Stršm.

+and Johan Ström.

btg_thumb.jpg @@ -83,6 +83,12 @@ client with a quite unique look.

moopolice_thumb.gif +

Linkage

+

Linkage is a gtkmm client that aims to be middle weight.

+ +Linkage.jpg + +

BitsCast

RSS reader, podcast subscriber, video feed downloader, bittorrent diff --git a/docs/projects.rst b/docs/projects.rst index f5629eecc..3d87d200a 100644 --- a/docs/projects.rst +++ b/docs/projects.rst @@ -56,6 +56,10 @@ project listed here, let me_ know. | MooPolice_ is a windows bittorrent | | | client with a quite unique look. | | +-------------------------------------------------------------------------------+-------------------------------------+ +| **Linkage** | .. image:: Linkage.jpg | +| | | +| Linkage_ is a gtkmm client that aims to be middle weight. | | ++-------------------------------------------------------------------------------+-------------------------------------+ | **BitsCast** | .. image:: bitscast_thumb.png | | | | | RSS reader, podcast subscriber, | | @@ -130,6 +134,7 @@ project listed here, let me_ know. .. _Acquasition: http://www.acquisitionx.com .. _IM: http://www.im.com/ .. _MooPolice: http://www.moopolice.de +.. _Linkage: http://code.google.com/p/linkage/ .. _BitsCast: http://www.bitscast.com/software/ .. _Jamplayer: http://www.jamendo.com/en/static/jamendotools_jamplayer/ .. _BitSlug: http://bitslug.sourceforge.net/ diff --git a/src/identify_client.cpp b/src/identify_client.cpp index ee9f95188..bfc06363c 100755 --- a/src/identify_client.cpp +++ b/src/identify_client.cpp @@ -155,6 +155,7 @@ namespace , map_entry("ES", "electric sheep") , map_entry("HL", "Halite") , map_entry("KT", "KTorrent") + , map_entry("LK", "Linkage") , map_entry("LP", "lphant") , map_entry("LT", "libtorrent") , map_entry("M", "Mainline")