kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-12 12:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
4223 commits 139 branches 325 tags 154 MiB
C++ 97.9%
CMake 1.5%
Ruby 0.3%
Python 0.3%
Find a file
Frank Reininghaus 7f381a34cb Merge remote-tracking branch 'origin/KDE/4.10' 
Conflicts:
	plasma/applets/folderview/folderview.cpp

CCMAIL: ignat.semenov@blue-systems.com

@Ignat: We've been following a merge-based approach in kde-baseapps
for quite some time now, see

http://lists.kde.org/?t=134744909400005&r=1&w=1

It would be nice if you could merge KDE/4.10 into master after any
non-trivial changes in folderview to prevent that others have to
figure out how to resolve the merge conflicts. Thanks!
2013-04-23 19:40:42 +02:00
src Merge remote-tracking branch 'origin/KDE/4.10' 2013-04-23 19:40:42 +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 remove redundant project declarations 2007-07-04 18:20:57 +00: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

README 

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