]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 087f4cb 4a774cb)
Merge branch 'master' into frameworks
authorEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Thu, 11 Sep 2014 08:50:56 +0000 (10:50 +0200)
committerEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Thu, 11 Sep 2014 08:50:56 +0000 (10:50 +0200)
1  2 
src/dolphinviewcontainer.cpp patch | diff1 | diff2 | blob | history

diff --cc src/dolphinviewcontainer.cpp
Simple merge