]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 550da74 ce4498e)
Merge remote-tracking branch 'origin/KDE/4.10'
authorLuca Beltrame <lbeltrame@kde.org>
Wed, 16 Jan 2013 22:42:25 +0000 (23:42 +0100)
committerLuca Beltrame <lbeltrame@kde.org>
Wed, 16 Jan 2013 22:42:25 +0000 (23:42 +0100)
1  2 
src/main.cpp patch | diff1 | diff2 | blob | history

diff --cc src/main.cpp
Simple merge