diff options
| author | Luca Beltrame <[email protected]> | 2014-07-16 10:13:57 +0200 |
|---|---|---|
| committer | Luca Beltrame <[email protected]> | 2014-07-16 10:13:57 +0200 |
| commit | e242d9548d11d92568a648efece5ff6c280b36cd (patch) | |
| tree | 414cc5b1eb313abf6b52ce978ee61e1f649167c3 /src/views/draganddrophelper.cpp | |
| parent | fc4315d57e8fe64d05aad2a1c24800f0149b21da (diff) | |
| parent | abd114f710b9d1247ecea4a82fb338492e9caf78 (diff) | |
Merge branch 'master' into frameworks
Conflicts:
kdepasswd/kcm/kcm_useraccount.desktop [deleted in frameworks branch]
plasma/applets/folderview/plasma-applet-folderview.desktop [deleted in frameworks branch]
Diffstat (limited to 'src/views/draganddrophelper.cpp')
0 files changed, 0 insertions, 0 deletions