dolphin/lib/konq
Stephan Kulow e77f20dbaf svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057
svn+ssh://coolo@svn.kde.org/home/kde/branches/work/kde4/kdebase
          .

I couldn't resolve one kicker conflict that results from different
development directions, so I rely on Aaron to sort it out - the file
is commited with conflicts

svn path=/trunk/KDE/kdebase/konqueror/keditbookmarks/; revision=439627
2005-07-28 14:59:42 +00:00
..
favicons svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
pics Adjusting datadir for use with unsermake. 2003-04-09 12:48:29 +00:00
Templates SVN_SILENT made messages (.desktop file) 2005-07-25 04:26:26 +00:00
AUTHORS Plugin capability for konq_popupmenu 2001-10-30 18:09:01 +00:00
DESIGN Hmpf, and this one. 2002-01-10 13:59:55 +00:00
directory_bookmarkbar.desktop SVN_SILENT made messages (.desktop file) 2005-07-25 04:26:26 +00:00
kfileivi.cc svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
kfileivi.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
kivdirectoryoverlay.cc svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
kivdirectoryoverlay.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
knewmenu.cc svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
knewmenu.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_bgnddlg.cc svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_bgnddlg.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_defaults.h update FSF address 2005-07-04 19:02:09 +00:00
konq_dirpart.cc svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_dirpart.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_drag.cc svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_drag.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_events.cc fix export's 2004-11-22 03:00:19 +00:00
konq_events.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_faviconmgr.cc svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_faviconmgr.h update FSF address 2005-07-04 19:02:09 +00:00
konq_filetip.cc svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_filetip.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_historycomm.cc Speed up history loader: marshall URLs as KURL and not as text strings in the storage files. 2003-02-18 00:11:32 +00:00
konq_historycomm.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_historymgr.cc svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_historymgr.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_iconviewwidget.cc svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_iconviewwidget.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_operations.cc svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_operations.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_pixmapprovider.cc svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_pixmapprovider.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_popupmenu.cc svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_popupmenu.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_propsview.cc svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_propsview.h update FSF address 2005-07-04 19:02:09 +00:00
konq_settings.cc update FSF address 2005-07-04 19:02:09 +00:00
konq_settings.h update FSF address 2005-07-04 19:02:09 +00:00
konq_sound.cc update FSF address 2005-07-04 19:02:09 +00:00
konq_sound.h update FSF address 2005-07-04 19:02:09 +00:00
konq_undo.cc svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_undo.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
konq_xmlguiclient.cc update FSF address 2005-07-04 19:02:09 +00:00
konq_xmlguiclient.h update FSF address 2005-07-04 19:02:09 +00:00
konqbookmarkmanager.h fix export's 2004-11-17 17:56:22 +00:00
konqpopupmenuplugin.desktop SVN_SILENT made messages (.desktop file) 2005-06-12 03:52:11 +00:00
libkonq_export.h update FSF address 2005-07-04 19:02:09 +00:00
Makefile.am update FSF address 2005-07-04 19:02:09 +00:00
PLUGINS Plugin capability for konq_popupmenu 2001-10-30 18:09:01 +00:00
SERVICEMENUS Add new entry into SERVICEMENU. 2003-08-23 17:55:47 +00:00