]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a46121d 4fe788f)
Merge branch 'master' into frameworks
authorEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Sun, 25 May 2014 12:43:18 +0000 (14:43 +0200)
committerEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Sun, 25 May 2014 12:43:18 +0000 (14:43 +0200)
Conflicts:
dolphin/src/statusbar/statusbarspaceinfo.cpp

1  2 
src/CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc src/CMakeLists.txt
Simple merge