diff options
| author | Frank Reininghaus <[email protected]> | 2014-06-01 14:52:56 +0200 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2014-06-01 14:52:56 +0200 |
| commit | 59d01e8accbfb7f31fb5ea5ef4c94e57d427994a (patch) | |
| tree | 62fca4d77b0644581c12b4bb81e6fc63091222cf /src/main.cpp | |
| parent | fa36c3fd1f53a223f43bb57d7c28e431a889a7c2 (diff) | |
| parent | 90e27974a4a4a3cb4d08717b5270bea8645b063e (diff) | |
Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
lib/konq/konq_operations.cpp
Diffstat (limited to 'src/main.cpp')
0 files changed, 0 insertions, 0 deletions