diff options
| author | Frank Reininghaus <[email protected]> | 2013-02-19 15:45:44 +0100 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2013-02-19 15:45:44 +0100 |
| commit | cc1455c0e6076c4abd5e321343be456184c51f5e (patch) | |
| tree | d9421bcd8ae237cd1eb97f30d1e645d10de9eb90 /src/dolphinviewcontainer.h | |
| parent | e6ef1eec3a5c0b9fdabff144990d06250fc1839e (diff) | |
| parent | 518b53feb43325d5c194fa15118e80ab0729b620 (diff) | |
Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
dolphin/src/tests/kfileitemmodeltest.cpp
lib/konq/konq_operations.cpp
Diffstat (limited to 'src/dolphinviewcontainer.h')
0 files changed, 0 insertions, 0 deletions