← Back to branch summary

~ubuntu-branches/ubuntu/trusty/nicotine/trusty

~ubuntu-branches/ubuntu/trusty/nicotine/trusty

Viewing all changes in revision 8.

Committer: Bazaar Package Importer
Author(s): Michael Terry
Date: 2009-05-12 08:52:40 UTC
mfrom: (6.1.1 squeeze)
Revision ID: james.westby@ubuntu.com-20090512085240-1xak77yrcc3jijyi

Tags: 1.2.10+dfsg-1ubuntu1

https://launchpad.net/bugs/317063

* Merge from debian unstable (LP: #317063), remaining changes:
- 15_no_crash_on_unknown_config.patch (updated)

files added:
doc/py2app

files/nicotine-plus-96px.icns

files/nicotine_blue_upscaled.icns

files/nicotine_blue_upscaled.png

img/ico

img/ico/nicotine+-.ico

img/ico/nicotine+-installer.ico

plugins

plugins/10-spamfilter.py

plugins/30-allmusic-url2search.py

plugins/30-discogs-url2search.py

plugins/30-musicbrainz-url2search.py

plugins/60-np-itunes-mac_osx.py

plugins/90-multipaste.py

plugins/README

plugins/examplars

plugins/examplars/10-antishout.py

plugins/examplars/10-testreplyer.py

plugins/examplars/99-checkport.py

plugins/examplars/README

pynicotine/gtkgui/chatrooms.glade

pynicotine/gtkgui/chatrooms_glade.py

pynicotine/gtkgui/mainwindow.glade

pynicotine/gtkgui/mainwindow_glade.py

pynicotine/gtkgui/pluginsystem.py

pynicotine/gtkgui/privatechat.glade

pynicotine/gtkgui/privatechat_glade.py

pynicotine/gtkgui/roomlist.glade

pynicotine/gtkgui/roomlist_glade.py

pynicotine/gtkgui/search.glade

pynicotine/gtkgui/search_glade.py

pynicotine/gtkgui/userbrowse.glade

pynicotine/gtkgui/userbrowse_glade.py

pynicotine/gtkgui/userinfo.glade

pynicotine/gtkgui/userinfo_glade.py

files removed:
debian/patches/02_rhythmbox_nowplaying.patch

debian/patches/03_settingswindow_combobox.patch

debian/patches/14_translations_oldserver.patch

pynicotine/gtkgui/nicotine.glade

pynicotine/gtkgui/nicotine_glade.py

files modified:
debian/changelog

debian/patches/04_buttons_ordering.patch

debian/patches/10_exitdialog.patch

debian/patches/11_disable_sound.patch

debian/patches/12_default_commands.patch

debian/patches/13_migrate_oldconfig.patch

debian/patches/15_no_crash_on_unknown_config.patch

debian/patches/series

doc/CHANGELOG

doc/MAINTAINERS

doc/NicotinePlusGuide.html

doc/README

img/away2.png

img/connect.png

img/disconnect.png

img/hilite2.png

languages/de/nicotine.po

languages/dk/nicotine.po

languages/es/nicotine.po

languages/eu/nicotine.po

languages/fi/nicotine.po

languages/fr/nicotine.po

languages/hu/nicotine.po

languages/it/nicotine.po

languages/lt/nicotine.po

languages/nicotine.pot

languages/nl/nicotine.po

languages/pl/nicotine.po

languages/pt_BR/nicotine.po

languages/sk/nicotine.po

languages/sv/nicotine.po

nicotine

pynicotine/config.py

pynicotine/gtkgui/about.py

pynicotine/gtkgui/chatrooms.py

pynicotine/gtkgui/dirchooser.py

pynicotine/gtkgui/downloads.py

pynicotine/gtkgui/entrydialog.py

pynicotine/gtkgui/frame.py

pynicotine/gtkgui/gen

pynicotine/gtkgui/glade2py.py

pynicotine/gtkgui/imagedata.py

pynicotine/gtkgui/nicotine-settings.glade

pynicotine/gtkgui/nowplaying.py

pynicotine/gtkgui/privatechat.py

pynicotine/gtkgui/search.py

pynicotine/gtkgui/settings_glade.py

pynicotine/gtkgui/settingswindow.py

pynicotine/gtkgui/transferlist.py

pynicotine/gtkgui/uploads.py

pynicotine/gtkgui/userbrowse.py

pynicotine/gtkgui/userinfo.py

pynicotine/gtkgui/userlist.py

pynicotine/gtkgui/utils.py

pynicotine/pynicotine.py

pynicotine/slskmessages.py

pynicotine/slskproto.py

pynicotine/transfers.py

pynicotine/utils.py

setup.py

trayicon/Makefile.in

trayicon/eggtrayicon.c

trayicon/trayiconmodule.c

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/patches/02_rhythmbox_nowplaying.patch

debian/patches/03_settingswindow_combobox.patch

debian/patches/04_buttons_ordering.patch

debian/patches/10_exitdialog.patch

debian/patches/11_disable_sound.patch

debian/patches/12_default_commands.patch

debian/patches/13_migrate_oldconfig.patch

debian/patches/14_translations_oldserver.patch

debian/patches/15_no_crash_on_unknown_config.patch

debian/patches/series

doc/MAINTAINERS

doc/NicotinePlusGuide.html

files/nicotine-plus-96px.icns

files/nicotine_blue_upscaled.icns

files/nicotine_blue_upscaled.png

img/connect.png

img/disconnect.png

img/hilite2.png

img/ico/nicotine+-.ico

img/ico/nicotine+-installer.ico

languages/de/nicotine.po

languages/dk/nicotine.po

languages/es/nicotine.po

languages/eu/nicotine.po

languages/fi/nicotine.po

languages/fr/nicotine.po

languages/hu/nicotine.po

languages/it/nicotine.po

languages/lt/nicotine.po

languages/nicotine.pot

languages/nl/nicotine.po

languages/pl/nicotine.po

languages/pt_BR/nicotine.po

languages/sk/nicotine.po

languages/sv/nicotine.po

plugins/10-spamfilter.py

plugins/30-allmusic-url2search.py

plugins/30-discogs-url2search.py

plugins/30-musicbrainz-url2search.py

plugins/60-np-itunes-mac_osx.py

plugins/90-multipaste.py

plugins/examplars/

plugins/examplars/10-antishout.py

plugins/examplars/10-testreplyer.py

plugins/examplars/99-checkport.py

plugins/examplars/README

pynicotine/config.py

pynicotine/gtkgui/about.py

pynicotine/gtkgui/chatrooms.glade

pynicotine/gtkgui/chatrooms.py

pynicotine/gtkgui/chatrooms_glade.py

pynicotine/gtkgui/dirchooser.py

pynicotine/gtkgui/downloads.py

pynicotine/gtkgui/entrydialog.py

pynicotine/gtkgui/frame.py

pynicotine/gtkgui/gen

pynicotine/gtkgui/glade2py.py

pynicotine/gtkgui/imagedata.py

pynicotine/gtkgui/mainwindow.glade

pynicotine/gtkgui/mainwindow_glade.py

pynicotine/gtkgui/nicotine-settings.glade

pynicotine/gtkgui/nicotine.glade

pynicotine/gtkgui/nicotine_glade.py

pynicotine/gtkgui/nowplaying.py

pynicotine/gtkgui/pluginsystem.py

pynicotine/gtkgui/privatechat.glade

pynicotine/gtkgui/privatechat.py

pynicotine/gtkgui/privatechat_glade.py

pynicotine/gtkgui/roomlist.glade

pynicotine/gtkgui/roomlist_glade.py

pynicotine/gtkgui/search.glade

pynicotine/gtkgui/search.py

pynicotine/gtkgui/search_glade.py

pynicotine/gtkgui/settings_glade.py

pynicotine/gtkgui/settingswindow.py

pynicotine/gtkgui/transferlist.py

pynicotine/gtkgui/uploads.py

pynicotine/gtkgui/userbrowse.glade

pynicotine/gtkgui/userbrowse.py

pynicotine/gtkgui/userbrowse_glade.py

pynicotine/gtkgui/userinfo.glade

pynicotine/gtkgui/userinfo.py

pynicotine/gtkgui/userinfo_glade.py

pynicotine/gtkgui/userlist.py

pynicotine/gtkgui/utils.py

pynicotine/pynicotine.py

pynicotine/slskmessages.py

pynicotine/slskproto.py

pynicotine/transfers.py

pynicotine/utils.py

trayicon/Makefile.in

trayicon/eggtrayicon.c

trayicon/trayiconmodule.c

Older »