Revision: amarok--lorentey--0--patch-315
Archive: lorentey@elte.hu--2004
Creator: Karoly Lorentey <lorentey@elte.hu>
Date: Mon May  8 17:24:54 CEST 2006
Standard-date: 2006-05-08 15:24:54 GMT
New-files: src/images/.arch-ids/splash_screen.jpg.id
    src/images/splash_screen.jpg
    src/mediadevice/generic/.arch-ids/=id
    src/mediadevice/generic/.arch-ids/Makefile.am.id
    src/mediadevice/generic/.arch-ids/amarok_generic-mediadevice.desktop.id
    src/mediadevice/generic/.arch-ids/genericmediadevice.cpp.id
    src/mediadevice/generic/.arch-ids/genericmediadevice.h.id
    src/mediadevice/generic/Makefile.am
    src/mediadevice/generic/amarok_generic-mediadevice.desktop
    src/mediadevice/generic/genericmediadevice.cpp
    src/mediadevice/generic/genericmediadevice.h
New-directories: src/mediadevice/generic
    src/mediadevice/generic/.arch-ids
Removed-files: src/images/.arch-ids/splash_screen.png.id
    src/images/splash_screen.png
    src/mediadevice/vfat/.arch-ids/Makefile.am.id
    src/mediadevice/vfat/.arch-ids/amarok_vfat-mediadevice.desktop.id
    src/mediadevice/vfat/.arch-ids/vfatmediadevice.cpp.id
    src/mediadevice/vfat/.arch-ids/vfatmediadevice.h.id
    src/mediadevice/vfat/Makefile.am
    src/mediadevice/vfat/amarok_vfat-mediadevice.desktop
    src/mediadevice/vfat/vfatmediadevice.cpp
    src/mediadevice/vfat/vfatmediadevice.h
Modified-files: ChangeLog amarok.kdevelop src/Options1.ui
    src/amarok.desktop src/amarok_append.desktop
    src/amarok_plugin.desktop src/amarokcore/amarok.kcfg
    src/app.cpp src/app.h src/collectionbrowser.cpp
    src/collectionbrowser.h src/collectiondb.cpp
    src/collectiondb.h src/configdialog.cpp
    src/contextbrowser.cpp src/cuefile.cpp src/cuefile.h
    src/database_refactor/sqlite/amarok_sqlite_dbengine_plugin.desktop
    src/dbsetup.ui src/deviceconfiguredialog.cpp
    src/deviceconfiguredialog.h src/devicemanager.cpp
    src/directorylist.cpp src/directorylist.h
    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/engine/xine/xine-engine.h src/enginecontroller.h
    src/images/Makefile.am src/konquisidebar/amarok.desktop
    src/loader/splash.cpp src/main.cpp src/mediabrowser.cpp
    src/mediabrowser.h src/mediadevice/Makefile.am
    src/mediadevice/fs/amarok_fs-mediadevice.desktop
    src/mediadevice/ifp/amarok_ifp-mediadevice.desktop
    src/mediadevice/ifp/ifpmediadevice.cpp
    src/mediadevice/ipod/amarok_ipod-mediadevice.desktop
    src/mediadevice/ipod/ipodmediadevice.cpp
    src/mediadevice/ipod/ipodmediadevice.h src/medium.h
    src/mediumpluginmanager.cpp src/mediumpluginmanager.h
    src/metabundle.cpp src/playlist.cpp
    src/playlistbrowser.cpp src/playlistbrowser.h
    src/playlistbrowseritem.cpp src/playlistbrowseritem.h
    src/playlistitem.cpp src/playlistloader.cpp
    src/pluginmanager.h src/podcastbundle.h
    src/podcastsettings.cpp src/scancontroller.cpp
    src/scriptmanager.cpp src/scripts/Makefile.am
    src/scripts/nowplaying/amaroknowplaying.rb
    src/scripts/rbot/quiz/quiz.rb
    src/scripts/ruby_debug/debug.rb src/scrobbler.cpp
    src/scrobbler.h src/smartplaylisteditor.cpp
    src/statistics.cpp src/statistics.h
    src/statusbar/overlayWidget.cpp
    src/statusbar/overlayWidget.h
    src/statusbar/selectLabel.h
    src/statusbar/statusBarBase.cpp src/transferdialog.cpp
    src/xmlloader.cpp
New-patches: lorentey@elte.hu--2004/amarok--lorentey--0--patch-315
    lorentey@elte.hu--2004/amarok--svn--0--patch-167
Summary: Merged in changes from amarok--svn--0
Keywords: 

Patches applied:

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