Revision: amarok--lorentey--0--patch-276
Archive: lorentey@elte.hu--2004
Creator: Karoly Lorentey <lorentey@elte.hu>
Date: Fri Jan 27 02:25:20 CET 2006
Standard-date: 2006-01-27 01:25:20 GMT
New-files: src/.arch-ids/atomicurl.cpp.id
    src/.arch-ids/atomicurl.h.id
    src/.arch-ids/columnlist.cpp.id
    src/.arch-ids/columnlist.h.id
    src/.arch-ids/mydirlister.h.id
    src/.arch-ids/mydiroperator.cpp.id
    src/.arch-ids/mydiroperator.h.id
    src/.arch-ids/tooltip.cpp.id src/.arch-ids/tooltip.h.id
    src/atomicurl.cpp src/atomicurl.h src/columnlist.cpp
    src/columnlist.h src/mydirlister.h src/mydiroperator.cpp
    src/mydiroperator.h src/scripts/.arch-ids/debug.rb.id
    src/scripts/debug.rb
    src/scripts/embedcover/.arch-ids/COPYING.id
    src/scripts/embedcover/COPYING
    src/scripts/lyrics_astraweb/.arch-ids/=id
    src/scripts/lyrics_astraweb/.arch-ids/COPYING.id
    src/scripts/lyrics_astraweb/.arch-ids/Makefile.am.id
    src/scripts/lyrics_astraweb/.arch-ids/README.id
    src/scripts/lyrics_astraweb/.arch-ids/lyrics_astraweb.rb.id
    src/scripts/lyrics_astraweb/COPYING
    src/scripts/lyrics_astraweb/Makefile.am
    src/scripts/lyrics_astraweb/README
    src/scripts/lyrics_astraweb/lyrics_astraweb.rb
    src/scripts/lyrics_lyrc/.arch-ids/COPYING.id
    src/scripts/lyrics_lyrc/.arch-ids/Makefile.am.id
    src/scripts/lyrics_lyrc/.arch-ids/README.id
    src/scripts/lyrics_lyrc/COPYING
    src/scripts/lyrics_lyrc/Makefile.am
    src/scripts/lyrics_lyrc/README
    src/scripts/mp3fix/.arch-ids/COPYING.id
    src/scripts/mp3fix/COPYING src/tooltip.cpp src/tooltip.h
New-directories: src/scripts/lyrics_astraweb
    src/scripts/lyrics_astraweb/.arch-ids
Removed-files: src/scripts/.arch-ids/script_ideas.txt.id
    src/scripts/script_ideas.txt
Modified-files: ChangeLog README TODO configure.in.bot
    src/Makefile.am src/Options1.ui.h
    src/amarok_append.desktop src/amarokcore/amarok.kcfg
    src/amarokcore/amarokdcophandler.cpp
    src/amarokcore/amarokdcophandler.h
    src/amarokcore/amarokdcopiface.h
    src/amarokcore/crashhandler.cpp src/app.cpp
    src/atomicstring.cpp src/atomicstring.h
    src/collectionbrowser.cpp src/collectionbrowser.h
    src/collectiondb.cpp src/collectiondb.h
    src/colorgenerator.h src/configdialog.cpp
    src/configdialog.h src/contextbrowser.cpp
    src/contextbrowser.h
    src/database_refactor/collectiondb.cpp
    src/devicemanager.h src/engine/helix/helix-engine.cpp
    src/engine/helix/helix-sp/gain.cpp
    src/engine/helix/helix-sp/helix-sp.cpp
    src/engine/helix/helix-sp/helix-sp.h
    src/engine/helix/helix-sp/hsphook.cpp
    src/engine/helix/helix-sp/hsphook.h
    src/engine/nmm/nmm_engine.cpp src/enginecontroller.cpp
    src/enginecontroller.h src/filebrowser.cpp
    src/filebrowser.h src/ktrm.cpp src/mediabrowser.cpp
    src/mediabrowser.h
    src/mediadevice/ifp/amarok_ifp-mediadevice.desktop
    src/mediadevice/ifp/ifpmediadevice.h
    src/mediadevice/ipod/amarok_ipod-mediadevice.desktop
    src/mediadevice/ipod/ipodmediadevice.cpp
    src/mediadevice/ipod/kiomediadevice.cpp
    src/mediadevice/ipod/kiomediadevice.h
    src/mediumpluginmanager.cpp src/metabundle.cpp
    src/metabundle.h src/osd.cpp src/playlist.cpp
    src/playlist.h src/playlistbrowser.cpp
    src/playlistbrowser.h src/playlistitem.cpp
    src/playlistitem.h src/playlistloader.cpp
    src/playlistloader.h src/playlistwindow.cpp
    src/scriptmanager.cpp src/scriptmanager.h
    src/scriptmanagerbase.ui src/scripts/Makefile.am
    src/scripts/embedcover/README
    src/scripts/lyrics_lyrc/lyrics_lyrc.rb
    src/scripts/mp3fix/README src/smartplaylisteditor.cpp
    src/tracktooltip.cpp src/tracktooltip.h
New-patches: lorentey@elte.hu--2004/amarok--lorentey--0--patch-276
    lorentey@elte.hu--2004/amarok--svn--0--patch-123
Summary: Merged from lorentey@elte.hu--2004 (patch 123)
Keywords: merge

Patches applied:

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