Revision: amarok--lorentey--0--patch-234
Archive: lorentey@elte.hu--2004
Creator: Karoly Lorentey <lorentey@elte.hu>
Date: Tue Nov  1 10:06:51 CET 2005
Standard-date: 2005-11-01 09:06:51 GMT
New-files: bksys/doc/.arch-ids/installing.dox.id
    bksys/doc/installing.dox
    src/.arch-ids/collectionscancontroller.cpp.id
    src/.arch-ids/collectionscancontroller.h.id
    src/.arch-ids/newdynamic.ui.id
    src/.arch-ids/playlistselection.cpp.id
    src/.arch-ids/playlistselection.h.id
    src/collectionscancontroller.cpp
    src/collectionscancontroller.h
    src/collectionscanner/.arch-ids/=id
    src/collectionscanner/.arch-ids/Makefile.am.id
    src/collectionscanner/.arch-ids/collectionscanner.cpp.id
    src/collectionscanner/.arch-ids/collectionscanner.h.id
    src/collectionscanner/.arch-ids/main.cpp.id
    src/collectionscanner/Makefile.am
    src/collectionscanner/collectionscanner.cpp
    src/collectionscanner/collectionscanner.h
    src/collectionscanner/main.cpp
    src/database_refactor/.arch-ids/=id
    src/database_refactor/.arch-ids/README.id
    src/database_refactor/.arch-ids/_Makefile.am.id
    src/database_refactor/.arch-ids/collectiondb.cpp.id
    src/database_refactor/.arch-ids/collectiondb.h.id
    src/database_refactor/.arch-ids/dbenginebase.cpp.id
    src/database_refactor/.arch-ids/dbenginebase.h.id
    src/database_refactor/README
    src/database_refactor/_Makefile.am
    src/database_refactor/collectiondb.cpp
    src/database_refactor/collectiondb.h
    src/database_refactor/dbenginebase.cpp
    src/database_refactor/dbenginebase.h
    src/database_refactor/mysql/.arch-ids/=id
    src/database_refactor/postgresql/.arch-ids/=id
    src/database_refactor/sqlite/.arch-ids/=id
    src/database_refactor/sqlite/.arch-ids/_Makefile.am.id
    src/database_refactor/sqlite/.arch-ids/amarok_sqlite_dbengine_plugin.desktop.id
    src/database_refactor/sqlite/.arch-ids/sqlite_dbengine.cpp.id
    src/database_refactor/sqlite/.arch-ids/sqlite_dbengine.h.id
    src/database_refactor/sqlite/_Makefile.am
    src/database_refactor/sqlite/amarok_sqlite_dbengine_plugin.desktop
    src/database_refactor/sqlite/sqlite_dbengine.cpp
    src/database_refactor/sqlite/sqlite_dbengine.h
    src/newdynamic.ui src/playlistselection.cpp
    src/playlistselection.h
New-directories: src/collectionscanner
    src/collectionscanner/.arch-ids src/database_refactor
    src/database_refactor/.arch-ids
    src/database_refactor/mysql
    src/database_refactor/mysql/.arch-ids
    src/database_refactor/postgresql
    src/database_refactor/postgresql/.arch-ids
    src/database_refactor/sqlite
    src/database_refactor/sqlite/.arch-ids
Removed-files: src/database/.arch-ids/README.id
    src/database/.arch-ids/_Makefile.am.id
    src/database/.arch-ids/collectiondb.cpp.id
    src/database/.arch-ids/collectiondb.h.id
    src/database/.arch-ids/dbenginebase.cpp.id
    src/database/.arch-ids/dbenginebase.h.id
    src/database/README src/database/_Makefile.am
    src/database/collectiondb.cpp
    src/database/collectiondb.h
    src/database/dbenginebase.cpp
    src/database/dbenginebase.h
    src/database/sqlite/.arch-ids/_Makefile.am.id
    src/database/sqlite/.arch-ids/amarok_sqlite_dbengine_plugin.desktop.id
    src/database/sqlite/.arch-ids/sqlite_dbengine.cpp.id
    src/database/sqlite/.arch-ids/sqlite_dbengine.h.id
    src/database/sqlite/_Makefile.am
    src/database/sqlite/amarok_sqlite_dbengine_plugin.desktop
    src/database/sqlite/sqlite_dbengine.cpp
    src/database/sqlite/sqlite_dbengine.h
Modified-files: ChangeLog SConstruct TODO amarok.kdevelop
    bksys/BUGS.TXT bksys/TODO.TXT bksys/compiler.py
    bksys/doc/index.dox bksys/doc/sconscript.dox
    bksys/generic.py bksys/kde4.py bksys/libxml.py
    bksys/lowlevel.py bksys/osx/detect_lowlevel.py
    bksys/osx/detect_qt4.py bksys/qt4.py
    bksys/scons-mini.tar.bz2 bksys/unix/detect_generic.py
    bksys/unix/detect_qt4.py bksys/win32/detect_generic.py
    bksys/win32/detect_qt4.py src/Makefile.am
    src/Options1.ui src/SConscript src/amarok.desktop
    src/amarok_append.desktop src/amarokcore/amarok.kcfg
    src/amarokcore/amarokdcophandler.cpp
    src/amarokcore/amarokdcophandler.h
    src/amarokcore/amarokdcopiface.h
    src/amarokcore/main.cpp src/app.cpp
    src/collectionbrowser.cpp src/collectiondb.cpp
    src/collectiondb.h src/contextbrowser.cpp
    src/contextbrowser.h
    src/engine/akode/amarok_aKode-engine.desktop
    src/engine/arts/amarok_artsengine_plugin.desktop
    src/engine/gst/amarok_gstengine_plugin.desktop
    src/engine/helix/amarok_helixengine_plugin.desktop
    src/engine/helix/helix-sp/gain.cpp
    src/engine/helix/helix-sp/gain.h
    src/engine/helix/helix-sp/helix-include/common/include/hxplugn.h
    src/engine/helix/helix-sp/helix-include/common/include/hxplugncompat.h
    src/engine/kdemm/amarok_kdemmengine_plugin.desktop
    src/engine/mas/amarok_masengine_plugin.desktop
    src/engine/nmm/amarok_nmmengine_plugin.desktop
    src/engine/nmm/nmm_engine.cpp
    src/engine/nmm/nmm_engine.h
    src/engine/xine/amarok_xine-engine.desktop
    src/engine/xine/xine-engine.cpp
    src/engine/xine/xine-engine.h src/gpodmediadevice.cpp
    src/gpodmediadevice.h src/images/amarok_icon.svg
    src/ipod/trackmetadata.cpp
    src/konquisidebar/amarok.desktop src/loader/Makefile.am
    src/mediabrowser.cpp src/mediabrowser.h
    src/metabundle.cpp src/metabundle.h src/party.cpp
    src/party.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/playlistwindow.cpp
    src/podcastsettings.cpp src/scriptmanager.cpp
    src/scriptmanager.h src/scrobbler.cpp src/statistics.cpp
    src/statistics.h src/statisticsbase.ui
    src/statusbar/queueLabel.cpp src/tagdialog.cpp
    src/themes/Makefile.am src/themes/example/Makefile.am
    src/themes/example/stylesheet.css
    src/themes/reinhardt/Makefile.am
    src/themes/reinhardt/images/Makefile.am
    src/themes/reinhardt/stylesheet.css
    src/trackpickerdialog.cpp src/tracktooltip.cpp
New-patches: lorentey@elte.hu--2004/amarok--lorentey--0--patch-234
    lorentey@elte.hu--2004/amarok--svn--0--patch-76
Summary: Merged from lorentey@elte.hu--2004 (patch 76)
Keywords: merge

Patches applied:

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