Revision: amarok--lorentey--0--patch-273
Archive: lorentey@elte.hu--2004
Creator: Karoly Lorentey <lorentey@elte.hu>
Date: Fri Jan 13 15:48:19 CET 2006
Standard-date: 2006-01-13 14:48:19 GMT
New-files: src/engine/akode/.arch-ids/=id
    src/engine/akode/.arch-ids/Makefile.am.id
    src/engine/akode/.arch-ids/akode-engine.cpp.id
    src/engine/akode/.arch-ids/akode-engine.h.id
    src/engine/akode/.arch-ids/akode-scope.cpp.id
    src/engine/akode/.arch-ids/akode-scope.h.id
    src/engine/akode/.arch-ids/amarok_aKode-engine.desktop.id
    src/engine/akode/Makefile.am
    src/engine/akode/akode-engine.cpp
    src/engine/akode/akode-engine.h
    src/engine/akode/akode-scope.cpp
    src/engine/akode/akode-scope.h
    src/engine/akode/amarok_aKode-engine.desktop
    src/engine/nmm/.arch-ids/ServerregistryPing.cpp.id
    src/engine/nmm/.arch-ids/ServerregistryPing.h.id
    src/engine/nmm/ServerregistryPing.cpp
    src/engine/nmm/ServerregistryPing.h
New-directories: src/engine/akode
Removed-files: src/engine/akode/.arch-ids/=id
Removed-directories: src/engine/akode
Renamed-directories: src/engine/akode/.arch-ids src/engine/akode/.arch-ids
Modified-files: ChangeLog README TODO amarok.kdevelop
    configure.in.bot configure.in.in
    src/amarok_plugin.desktop
    src/amarokcore/amarokdcophandler.cpp
    src/amarokcore/amarokdcophandler.h
    src/amarokcore/amarokdcopiface.h
    src/collectionbrowser.cpp src/collectiondb.cpp
    src/collectionscanner/collectionscanner.cpp
    src/collectionscanner/collectionscanner.h
    src/collectionscanner/main.cpp src/contextbrowser.cpp
    src/contextbrowser.h
    src/database_refactor/collectiondb.cpp
    src/engine/Makefile.am
    src/engine/gst10/amarok_gst10engine_plugin.desktop
    src/engine/nmm/AudioHostListItem.cpp
    src/engine/nmm/AudioHostListItem.h
    src/engine/nmm/Makefile.am
    src/engine/nmm/nmm_engine.cpp
    src/engine/nmm/nmm_engine.h
    src/engine/xine/xine-engine.cpp src/mediabrowser.cpp
    src/mediabrowser.h
    src/mediadevice/ifp/amarok_ifp-mediadevice.desktop
    src/mediadevice/ipod/Makefile.am
    src/mediadevice/ipod/amarok_ipod-mediadevice.desktop
    src/mediadevice/ipod/ipodmediadevice.cpp
    src/mediadevice/ipod/ipodmediadevice.h
    src/mediadevice/ipod/kiomediadevice.cpp
    src/mediadevice/ipod/kiomediadevice.h
    src/mediumpluginchooser.cpp src/metabundle.cpp
    src/metabundle.h src/metadata/rmff/rmff.h
    src/metadata/rmff/taglib_realmediafiletyperesolver.cpp
    src/osd.cpp src/playlist.cpp src/playlist.h
    src/playlistitem.cpp src/playlistitem.h
    src/playlistloader.cpp src/scancontroller.cpp
    src/scrobbler.cpp src/statistics.cpp src/tagdialog.cpp
    src/tagdialogbase.ui src/tracktooltip.cpp
New-patches: lorentey@elte.hu--2004/amarok--lorentey--0--patch-273
    lorentey@elte.hu--2004/amarok--svn--0--patch-117
    lorentey@elte.hu--2004/amarok--svn--0--patch-118
Summary: Merged from lorentey@elte.hu--2004 (patch 117-118)
Keywords: merge

Patches applied:

 * lorentey@elte.hu--2004/amarok--svn--0--patch-117
   Remove src/engine/akode directory.

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