Revision: amarok--lorentey--0--patch-345
Archive: lorentey@elte.hu--2004
Creator: Karoly Lorentey <lorentey@elte.hu>
Date: Thu Jul 13 15:58:08 CEST 2006
Standard-date: 2006-07-13 13:58:08 GMT
New-files: src/.arch-ids/Options7.ui.h.id src/Options7.ui.h
    src/mediadevice/daap/.arch-ids/addhostbase.ui.id
    src/mediadevice/daap/addhostbase.ui
    src/scripts/.arch-ids/rbeautify.rb.id
    src/scripts/rbeautify.rb
Modified-files: ChangeLog amarok.kdevelop src/Options7.ui
    src/amarok.desktop src/amarok_append.desktop
    src/amarok_plugin.desktop src/amarok_proxy.rb
    src/amarokcore/amarok.kcfg
    src/amarokcore/amarokdcophandler.cpp
    src/amarokcore/amarokdcophandler.h
    src/amarokcore/amarokdcopiface.h src/app.cpp
    src/collectiondb.cpp src/collectiondb.h
    src/contextbrowser.cpp
    src/database_refactor/sqlite/amarok_sqlite_dbengine_plugin.desktop
    src/deviceconfiguredialog.cpp
    src/engine/akode/amarok_aKode-engine.desktop
    src/engine/gst10/amarok_gst10engine_plugin.desktop
    src/engine/helix/amarok_helixengine_plugin.desktop
    src/engine/kdemm/amarok_kdemmengine_plugin.desktop
    src/engine/mas/amarok_masengine_plugin.desktop
    src/engine/nmm/amarok_nmmengine_plugin.desktop
    src/engine/void/amarok_void-engine_plugin.desktop
    src/engine/xine/amarok_xine-engine.desktop
    src/engine/xine/xine-engine.cpp
    src/konquisidebar/amarok.desktop src/lastfm.cpp
    src/mediabrowser.cpp src/mediabrowser.h
    src/mediadevice/daap/Makefile.am
    src/mediadevice/daap/amarok_daap-mediadevice.desktop
    src/mediadevice/daap/daapclient.cpp
    src/mediadevice/daap/daapclient.h
    src/mediadevice/daap/daapreader/authentication/contentfetcher.cpp
    src/mediadevice/daap/daapreader/authentication/contentfetcher.h
    src/mediadevice/daap/daapreader/reader.cpp
    src/mediadevice/daap/daapreader/reader.h
    src/mediadevice/daap/proxy.cpp
    src/mediadevice/fs/amarok_fs-mediadevice.desktop
    src/mediadevice/generic/amarok_generic-mediadevice.desktop
    src/mediadevice/ifp/amarok_ifp-mediadevice.desktop
    src/mediadevice/ipod/amarok_ipod-mediadevice.desktop
    src/mediadevice/njb/amarok_njb-mediadevice.desktop
    src/mediumpluginmanager.cpp src/metabundle.cpp
    src/metabundle.h src/multitabbar.cpp src/playlist.cpp
    src/playlist.h src/playlistbrowser.cpp
    src/playlistbrowser.h src/playlistitem.cpp
    src/playlistloader.cpp src/statusbar/selectLabel.h
    src/systray.cpp
New-patches: lorentey@elte.hu--2004/amarok--lorentey--0--patch-345
    lorentey@elte.hu--2004/amarok--svn--0--patch-195
    lorentey@elte.hu--2004/amarok--svn--0--patch-196
Summary: Merged in changes from amarok--svn--0
Keywords: 

Patches applied:

 * lorentey@elte.hu--2004/amarok--svn--0--patch-195
   Update from Subversion

 * lorentey@elte.hu--2004/amarok--svn--0--patch-196
   Update from Subversion