Revision: amarok--lorentey--0--patch-292
Archive: lorentey@elte.hu--2004
Creator: Karoly Lorentey <lorentey@elte.hu>
Date: Mon Feb 27 10:18:32 CET 2006
Standard-date: 2006-02-27 09:18:32 GMT
New-files: src/engine/nmm/.arch-ids/HostListItem.cpp.id
    src/engine/nmm/.arch-ids/HostListItem.h.id
    src/engine/nmm/.arch-ids/PixmapToggleButton.cpp.id
    src/engine/nmm/.arch-ids/PixmapToggleButton.h.id
    src/engine/nmm/HostListItem.cpp
    src/engine/nmm/HostListItem.h
    src/engine/nmm/PixmapToggleButton.cpp
    src/engine/nmm/PixmapToggleButton.h
Removed-files: src/engine/nmm/.arch-ids/AudioHostListItem.cpp.id
    src/engine/nmm/.arch-ids/AudioHostListItem.h.id
    src/engine/nmm/AudioHostListItem.cpp
    src/engine/nmm/AudioHostListItem.h
    src/images/.arch-ids/nmm_logo.png.id
    src/images/nmm_logo.png src/sqlite/.arch-ids/os.c.id
    src/sqlite/os.c
Modified-files: ChangeLog src/actionclasses.cpp
    src/amarok_append.desktop src/collectiondb.cpp
    src/collectiondb.h
    src/collectionscanner/collectionscanner.cpp
    src/collectionscanner/collectionscanner.h
    src/engine/akode/amarok_aKode-engine.desktop
    src/engine/gst10/amarok_gst10engine_plugin.desktop
    src/engine/helix/helix-engine.cpp
    src/engine/helix/helix-engine.h
    src/engine/helix/helix-sp/hspalsadevice.h
    src/engine/helix/helix-sp/hsphook.cpp
    src/engine/helix/hxplayercontrol.cpp
    src/engine/nmm/Makefile.am
    src/engine/nmm/nmm_configdialog.cpp
    src/engine/nmm/nmm_configdialog.h
    src/engine/nmm/nmm_configdialogbase.ui
    src/engine/nmm/nmm_engine.cpp
    src/engine/nmm/nmm_engine.h
    src/engine/nmm/nmm_kdeconfig.kcfg
    src/images/Makefile.am src/images/nocover.png
    src/images/shadow_albumcover.png src/mediabrowser.cpp
    src/mediadevice/fs/amarok_fs-mediadevice.desktop
    src/mediadevice/ifp/amarok_ifp-mediadevice.desktop
    src/mediadevice/ipod/amarok_ipod-mediadevice.desktop
    src/mediadevice/ipod/ipodmediadevice.cpp
    src/mediadevice/vfat/amarok_vfat-mediadevice.desktop
    src/mediadevice/vfat/vfatmediadevice.cpp
    src/mediadevice/vfat/vfatmediadevice.h
    src/organizecollectiondialog.ui src/playlist.cpp
    src/playlistbrowser.cpp src/playlistbrowseritem.cpp
    src/playlistloader.cpp src/scancontroller.cpp
    src/scripts/amarok-svn/amarok-svn.sh
    src/scripts/databasescripts/staleAlbums.rb
    src/scripts/databasescripts/staleArtists.rb
    src/scripts/databasescripts/staleImages.rb
    src/scrobbler.cpp src/sqlite/Makefile.am
    src/sqlite/alter.c src/sqlite/analyze.c
    src/sqlite/attach.c src/sqlite/auth.c src/sqlite/btree.c
    src/sqlite/btree.h src/sqlite/build.c
    src/sqlite/callback.c src/sqlite/complete.c
    src/sqlite/date.c src/sqlite/delete.c src/sqlite/expr.c
    src/sqlite/func.c src/sqlite/hash.c src/sqlite/insert.c
    src/sqlite/keywordhash.h src/sqlite/legacy.c
    src/sqlite/main.c src/sqlite/opcodes.c
    src/sqlite/opcodes.h src/sqlite/os.h
    src/sqlite/os_common.h src/sqlite/os_unix.c
    src/sqlite/os_win.c src/sqlite/pager.c
    src/sqlite/pager.h src/sqlite/parse.c src/sqlite/parse.h
    src/sqlite/pragma.c src/sqlite/prepare.c
    src/sqlite/printf.c src/sqlite/select.c
    src/sqlite/sqlite3.h src/sqlite/sqliteInt.h
    src/sqlite/table.c src/sqlite/tokenize.c
    src/sqlite/trigger.c src/sqlite/update.c
    src/sqlite/utf.c src/sqlite/util.c src/sqlite/vacuum.c
    src/sqlite/vdbe.c src/sqlite/vdbe.h src/sqlite/vdbeInt.h
    src/sqlite/vdbeapi.c src/sqlite/vdbeaux.c
    src/sqlite/vdbemem.c src/sqlite/where.c
    src/statistics.cpp src/statusbar/statusbar.cpp
    src/tagdialog.cpp
New-patches: lorentey@elte.hu--2004/amarok--lorentey--0--patch-292
    lorentey@elte.hu--2004/amarok--svn--0--patch-142
Summary: Merged in changes from amarok--svn--0
Keywords: 

Patches applied:

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