diff options
| author | Luca Beltrame <[email protected]> | 2014-08-03 18:49:43 +0200 |
|---|---|---|
| committer | Luca Beltrame <[email protected]> | 2014-08-03 18:49:43 +0200 |
| commit | df871967c948de1aeb4d635fafd937369121aef0 (patch) | |
| tree | 596ab2bb91a9388d950a204f083ceb546d83a344 /docs | |
| parent | 228aadd4d99498639d1b09f7cf09812a8071097a (diff) | |
| parent | 9203fdc4d9945b391cf0722334934df446938867 (diff) | |
Merge branch 'master' into frameworks
Conflicts:
dolphin/src/panels/places/placesitemmodel.cpp
kdepasswd/kcm/CMakeLists.txt [deleted in frameworks]
kdepasswd/kcm/main.cpp [deleted in frameworks]
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions