diff options
| author | Stephan Kulow <coolo@kde.org> | 2005-07-28 14:59:42 +0000 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2014-04-26 14:11:13 +0200 |
| commit | 3eaf04e113e9edab0ed2a8b5a16dfa49717c8d3e (patch) | |
| tree | dc6f806d4b0d0f19cb936a1e1aead6f42e0c6c0a /src/core/ksharedconfig.cpp | |
| parent | 5eb52e9f5a5cbe89b5569dcd2d5a9a8ee6133743 (diff) | |
| download | kconfig-3eaf04e113e9edab0ed2a8b5a16dfa49717c8d3e.tar.gz kconfig-3eaf04e113e9edab0ed2a8b5a16dfa49717c8d3e.tar.bz2 | |
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/kioslave/; revision=439627
Diffstat (limited to 'src/core/ksharedconfig.cpp')
0 files changed, 0 insertions, 0 deletions