Find a file
Frank Reininghaus 4cf04b91dd Merge remote-tracking branch 'origin/master' into frameworks
Since the master branch had never been merged into frameworks since the
creation of the frameworks branch, I had to fix a couple of merge
conflicts and make another change in order to make it build - I hope I
did not get anything wrong.

We should probably merge master into frameworks on a regular basis from
now on.

CCMAIL:kfm-devel@kde.org

Conflicts:
	dolphin/src/dolphinmainwindow.cpp
	dolphin/src/search/dolphinfacetswidget.cpp
	dolphin/src/statusbar/dolphinstatusbar.cpp
	dolphin/src/views/dolphinview.cpp
2014-05-13 18:42:05 +02:00
src Merge remote-tracking branch 'origin/master' into frameworks 2014-05-13 18:42:05 +02:00
AUTHORS updated to KDE 4 (the file was valid for Dolphin for KDE 3) 2008-07-07 09:18:51 +00:00
CMakeLists.txt Allow compiling Dolphin with KF5 2014-05-05 23:05:13 +02:00
COPYING commited initial version of Dolphin 2006-11-21 06:02:05 +00:00
COPYING.DOC updates for new licence policy 2008-01-12 16:39:07 +00:00
README it's http://dolphin.kde.org/ now 2008-07-26 14:01:34 +00:00

See http://dolphin.kde.org for information about Dolphin.