Revision: amarok--lorentey--0--patch-302
Archive: lorentey@elte.hu--2004
Creator: Karoly Lorentey <lorentey@elte.hu>
Date: Fri Mar 31 20:31:27 CEST 2006
Standard-date: 2006-03-31 18:31:27 GMT
New-files: src/.arch-ids/dynamicmode.cpp.id
    src/.arch-ids/dynamicmode.h.id src/dynamicmode.cpp
    src/dynamicmode.h src/engine/nmm/icons/.arch-ids/=id
    src/engine/nmm/icons/.arch-ids/Makefile.am.id
    src/engine/nmm/icons/.arch-ids/hi16-action-nmm_option_off.png.id
    src/engine/nmm/icons/.arch-ids/hi16-action-nmm_option_on.png.id
    src/engine/nmm/icons/.arch-ids/hi16-action-nmm_option_on_readonly.png.id
    src/engine/nmm/icons/Makefile.am
    src/engine/nmm/icons/hi16-action-nmm_option_off.png
    src/engine/nmm/icons/hi16-action-nmm_option_on.png
    src/engine/nmm/icons/hi16-action-nmm_option_on_readonly.png
New-directories: src/engine/nmm/icons
    src/engine/nmm/icons/.arch-ids
Removed-files: src/.arch-ids/party.cpp.id
    src/.arch-ids/party.h.id
    src/engine/gst10/.arch-ids/adapter.c.id
    src/engine/gst10/.arch-ids/adapter.h.id
    src/engine/gst10/adapter.c src/engine/gst10/adapter.h
    src/engine/nmm/.arch-ids/hi16-action-nmm_option_off.png.id
    src/engine/nmm/.arch-ids/hi16-action-nmm_option_on.png.id
    src/engine/nmm/.arch-ids/hi16-action-nmm_option_on_readonly.png.id
    src/engine/nmm/hi16-action-nmm_option_off.png
    src/engine/nmm/hi16-action-nmm_option_on.png
    src/engine/nmm/hi16-action-nmm_option_on_readonly.png
    src/party.cpp src/party.h
Modified-files: ChangeLog TODO configure.in.bot
    configure.in.in src/Makefile.am src/SConscript
    src/actionclasses.cpp src/actionclasses.h
    src/amarok.desktop src/amarok.h
    src/amarok_plugin.desktop src/amarokcore/amarok.kcfg
    src/amarokcore/amarokdcophandler.cpp
    src/amarokcore/amarokdcophandler.h
    src/amarokcore/amarokdcopiface.h
    src/analyzers/analyzerbase.cpp src/app.cpp
    src/browserbar.cpp src/browserbar.h
    src/collectionbrowser.cpp src/collectionbrowser.h
    src/collectiondb.cpp src/collectiondb.h
    src/collectionscanner/collectionscanner.cpp
    src/collectionscanner/collectionscanner.h
    src/contextbrowser.cpp src/contextbrowser.h
    src/database_refactor/sqlite/amarok_sqlite_dbengine_plugin.desktop
    src/engine/enginebase.cpp src/engine/enginebase.h
    src/engine/gst10/amarok_gst10engine_plugin.desktop
    src/engine/gst10/gstengine.cpp
    src/engine/gst10/gstengine.h
    src/engine/helix/amarok_helixengine_plugin.desktop
    src/engine/helix/helix-configdialog.cpp
    src/engine/helix/helix-engine.cpp
    src/engine/helix/helix-engine.h
    src/engine/helix/helix-sp/hspalsadevice.cpp
    src/engine/helix/helix-sp/hspalsadevice.h
    src/engine/helix/hxplayercontrol.cpp
    src/engine/kdemm/amarok_kdemmengine_plugin.desktop
    src/engine/mas/amarok_masengine_plugin.desktop
    src/engine/nmm/HostListItem.cpp
    src/engine/nmm/HostListItem.h
    src/engine/nmm/Makefile.am
    src/engine/nmm/amarok_nmmengine_plugin.desktop
    src/engine/nmm/nmm_configdialogbase.ui
    src/engine/nmm/nmm_engine.cpp
    src/engine/nmm/nmm_engine.h
    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-scope.c src/enginecontroller.cpp
    src/equalizersetup.cpp src/equalizersetup.h
    src/filebrowser.cpp src/filebrowser.h
    src/konquisidebar/amarok.desktop src/main.cpp
    src/mediabrowser.cpp src/mediabrowser.h
    src/mediadevice/fs/amarok_fs-mediadevice.desktop
    src/mediadevice/ifp/amarok_ifp-mediadevice.desktop
    src/mediadevice/ifp/ifpmediadevice.cpp
    src/mediadevice/ifp/ifpmediadevice.h
    src/mediadevice/ipod/amarok_ipod-mediadevice.desktop
    src/mediadevice/ipod/ipodmediadevice.cpp
    src/mediadevice/ipod/ipodmediadevice.h
    src/mediadevice/vfat/amarok_vfat-mediadevice.desktop
    src/mediadevice/vfat/vfatmediadevice.cpp
    src/mediadevice/vfat/vfatmediadevice.h
    src/metabundle.cpp src/metabundle.h
    src/organizecollectiondialog.ui.h src/osd.cpp src/osd.h
    src/playlist.cpp src/playlist.h src/playlistbrowser.cpp
    src/playlistbrowser.h src/playlistbrowseritem.cpp
    src/playlistbrowseritem.h src/playlistitem.cpp
    src/playlistitem.h src/playlistloader.cpp
    src/playlistloader.h src/playlistselection.cpp
    src/playlistselection.h src/playlistwindow.cpp
    src/playlistwindow.h src/podcastbundle.h
    src/podcastsettings.cpp src/podcastsettings.h
    src/scancontroller.cpp src/scrobbler.cpp
    src/sliderwidget.cpp src/sliderwidget.h
    src/statistics.cpp src/statistics.h
    src/statusbar/statusbar.cpp src/statusbar/statusbar.h
    src/tagdialog.cpp src/tracktooltip.cpp
    src/tracktooltip.h src/vis/libvisual/libvisual.cpp
    src/vis/libvisual/libvisual.h
    src/vis/xmmswrapper/xmmswrapper.cpp src/xmlloader.cpp
    src/xmlloader.h src/xmlloader_p.h
New-patches: lorentey@elte.hu--2004/amarok--lorentey--0--patch-302
    lorentey@elte.hu--2004/amarok--svn--0--patch-154
Summary: Merged from lorentey@elte.hu--2004 (patch 154)
Keywords: merge

Patches applied:

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