diff options
| author | Emmanuel Pescosta <[email protected]> | 2014-07-10 22:49:05 +0200 |
|---|---|---|
| committer | Emmanuel Pescosta <[email protected]> | 2014-07-10 22:49:05 +0200 |
| commit | fc4315d57e8fe64d05aad2a1c24800f0149b21da (patch) | |
| tree | 5661a5601ecb7a80a74996847b0119206530239d /src/main.cpp | |
| parent | c640dec3f621af25ecf0424bf3197dd439077438 (diff) | |
| parent | 1dfafcb176797e5075d0043e70ad07bde8bcc372 (diff) | |
Merge branch 'master' into frameworks
Conflicts:
dolphin/src/dolphinmainwindow.cpp
dolphin/src/dolphinviewcontainer.cpp
Diffstat (limited to 'src/main.cpp')
0 files changed, 0 insertions, 0 deletions