Revision: amarok--lorentey--0--patch-271
Archive: lorentey@elte.hu--2004
Creator: Karoly Lorentey <lorentey@elte.hu>
Date: Tue Jan  3 03:17:44 CET 2006
Standard-date: 2006-01-03 02:17:44 GMT
New-files: src/metadata/rmff/.arch-ids/=id
    src/metadata/rmff/.arch-ids/Makefile.am.id
    src/metadata/rmff/.arch-ids/rmff.cpp.id
    src/metadata/rmff/.arch-ids/rmff.h.id
    src/metadata/rmff/.arch-ids/taglib_realmediafile.cpp.id
    src/metadata/rmff/.arch-ids/taglib_realmediafile.h.id
    src/metadata/rmff/.arch-ids/taglib_realmediafiletyperesolver.cpp.id
    src/metadata/rmff/.arch-ids/taglib_realmediafiletyperesolver.h.id
    src/metadata/rmff/Makefile.am
    src/metadata/rmff/rmff.cpp src/metadata/rmff/rmff.h
    src/metadata/rmff/taglib_realmediafile.cpp
    src/metadata/rmff/taglib_realmediafile.h
    src/metadata/rmff/taglib_realmediafiletyperesolver.cpp
    src/metadata/rmff/taglib_realmediafiletyperesolver.h
    src/scripts/nowplaying/.arch-ids/=id
    src/scripts/nowplaying/.arch-ids/amaroknowplaying.rb.id
    src/scripts/nowplaying/amaroknowplaying.rb
New-directories: src/metadata/rmff
    src/metadata/rmff/.arch-ids src/scripts/nowplaying
    src/scripts/nowplaying/.arch-ids
Modified-files: ChangeLog TODO packers_amarok.vcf
    src/amarokcore/amarokdcophandler.cpp
    src/amarokcore/amarokdcophandler.h
    src/amarokcore/amarokdcopiface.h src/clicklineedit.cpp
    src/clicklineedit.h src/collectionbrowser.cpp
    src/collectiondb.cpp src/contextbrowser.cpp
    src/contextbrowser.h src/htmlview.cpp
    src/mediadevice/ipod/ipodmediadevice.cpp
    src/mediadevice/ipod/ipodmediadevice.h src/metabundle.h
    src/metadata/Makefile.am
    src/metadata/mp4/taglib_mp4file.cpp
    src/metadata/tplugins.cpp src/playlist.cpp
    src/playlist.h src/playlistitem.cpp src/playlistitem.h
    src/scriptmanager.cpp
    src/scripts/amarok-svn/amarok-svn.sh src/scrobbler.cpp
    src/smartplaylisteditor.cpp
    src/statusbar/statusBarBase.cpp src/tagdialog.cpp
    src/tagdialog.h src/themes/example/stylesheet.css
    src/themes/reinhardt/stylesheet.css
New-patches: lorentey@elte.hu--2004/amarok--lorentey--0--patch-271
    lorentey@elte.hu--2004/amarok--svn--0--patch-115
Summary: Merged from lorentey@elte.hu--2004 (patch 115)
Keywords: merge

Patches applied:

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