From 7598312969f8f0fcbc9ccefcc533b458c9154371 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Mon, 25 Feb 2013 23:00:13 +0000 Subject: [PATCH] Update .gitattributes, Changelog and man files --- .gitattributes | 19 +++++++++++++------ ChangeLog | 2 +- docs/man/deluge-console.1 | 2 +- docs/man/deluge-gtk.1 | 2 +- docs/man/deluge-web.1 | 2 +- docs/man/deluge.1 | 2 +- docs/man/deluged.1 | 2 +- osx/Info.plist | 8 ++++---- 8 files changed, 23 insertions(+), 16 deletions(-) diff --git a/.gitattributes b/.gitattributes index bba470295..b9b65cfcf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,16 +1,23 @@ -/libtorrent export-ignore -/win32 export-ignore -docs/build export-ignore -docs/source export-ignore -/tests export-ignore -deluge/scripts export-ignore +/libtorrent/ export-ignore +/win32/ export-ignore +/osx/ export-ignore +docs/build/ export-ignore +docs/source/ export-ignore +/tests/ export-ignore +deluge/scripts/ export-ignore setup.cfg export-ignore check_glade.sh export-ignore createicons.sh export-ignore create_potfiles_in.py export-ignore gettextize.sh export-ignore +deluge/i18n/deluge.pot export-ignore deluge/ui/web/css/*-debug.css export-ignore deluge/ui/web/js/*-debug.js export-ignore +deluge/ui/web/js/deluge-all/ export-ignore +deluge/ui/web/js/ext-extensions/ export-ignore +deluge/ui/web/gen_gettext.py export-ignore +deluge/ui/web/build export-ignore +deluge/ui/web/docs/ export-ignore .gitattributes export-ignore .gitmodules export-ignore diff --git a/ChangeLog b/ChangeLog index 304f22698..5f36cc09f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,7 +42,7 @@ would keep updating one call after the other. If the value changed, the timer is now stopped and restarted using the new value. -=== Deluge 1.3.6 (In Development) === +=== Deluge 1.3.6 (25 Feburary 2013) === ==== Core ==== * Catch & log KeyError when removing a torrent from the queued torrents set * Fix moving/renaming torrents issues when using libtorrent 0.16 diff --git a/docs/man/deluge-console.1 b/docs/man/deluge-console.1 index 586bb588a..1c24b9951 100644 --- a/docs/man/deluge-console.1 +++ b/docs/man/deluge-console.1 @@ -1,4 +1,4 @@ -.TH DELUGE-CONSOLE 1 "October 2009" "1.3.0" +.TH DELUGE-CONSOLE 1 "January 2099" "1.3.900-dev" .SH NAME deluge-console - a bittorrent client curses interface diff --git a/docs/man/deluge-gtk.1 b/docs/man/deluge-gtk.1 index f16fec323..8a59c3959 100644 --- a/docs/man/deluge-gtk.1 +++ b/docs/man/deluge-gtk.1 @@ -1,4 +1,4 @@ -.TH DELUGE-GTK 1 "October 2009" "1.3.0" +.TH DELUGE-GTK 1 "January 2099" "1.3.900-dev" .SH NAME deluge-gtk - a bittorrent client gtk interface diff --git a/docs/man/deluge-web.1 b/docs/man/deluge-web.1 index b3d861c0b..b758e79dc 100644 --- a/docs/man/deluge-web.1 +++ b/docs/man/deluge-web.1 @@ -1,4 +1,4 @@ -.TH DELUGE-WEB 1 "October 2009" "1.3.0" +.TH DELUGE-WEB 1 "January 2099" "1.3.900-dev" .SH NAME deluge-web - a bittorrent client ajax web interface diff --git a/docs/man/deluge.1 b/docs/man/deluge.1 index b61b28272..72b0cfc31 100644 --- a/docs/man/deluge.1 +++ b/docs/man/deluge.1 @@ -1,4 +1,4 @@ -.TH DELUGE 1 "October 2009" "1.3.0" +.TH DELUGE 1 "January 2099" "1.3.900-dev" .SH NAME deluge - a bittorrent client diff --git a/docs/man/deluged.1 b/docs/man/deluged.1 index 954f26f9a..926044f90 100644 --- a/docs/man/deluged.1 +++ b/docs/man/deluged.1 @@ -1,4 +1,4 @@ -.TH DELUGED 1 "October 2009" "1.3.0" +.TH DELUGED 1 ""January 2099" "1.3.900-dev" .SH NAME deluged - a bittorrent client daemon diff --git a/osx/Info.plist b/osx/Info.plist index 52bdca08b..d681a663b 100644 --- a/osx/Info.plist +++ b/osx/Info.plist @@ -11,13 +11,13 @@ CFBundleExecutable Deluge CFBundleShortVersionString - 1.3.5 + 1.3.900-dev CFBundleVersion - 1.3.5 + 1.3.900-dev CFBundleGetInfoString - 1.3.5 (c) 2008-2011 Deluge Team http://deluge-torrent.org/ + 1.3.900-dev (c) 2008-2013 Deluge Team http://deluge-torrent.org/ NSHumanReadableCopyright - Copyright 2008-2011 Deluge Team + Copyright 2008-2013 Deluge Team CFBundleDevelopmentRegion English CFBundleInfoDictionaryVersion