diff options
| author | Frank Reininghaus <[email protected]> | 2014-06-29 20:26:17 +0200 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2014-06-29 20:28:46 +0200 |
| commit | 81b84a1eaf9fcfc3c2318b7ab4d30c7c578e9680 (patch) | |
| tree | cac867ccfa59547b10ce37b14a363403fb6ee81c /src/tests/CMakeLists.txt | |
| parent | 81d5335060dd640298c62e7fc4fd6a32a34c3e9d (diff) | |
| parent | 74d8522ac63199b702a09610ca7b1a7071a7215b (diff) | |
Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
dolphin/src/dolphinmainwindow.cpp
dolphin/src/dolphinmainwindow.h
Diffstat (limited to 'src/tests/CMakeLists.txt')
0 files changed, 0 insertions, 0 deletions