]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge remote-tracking branch 'origin/KDE/4.10'
authorFrank Reininghaus <frank78ac@googlemail.com>
Sat, 11 May 2013 16:47:58 +0000 (18:47 +0200)
committerFrank Reininghaus <frank78ac@googlemail.com>
Sat, 11 May 2013 16:47:58 +0000 (18:47 +0200)
Conflicts:
CMakeLists.txt

1  2 
src/tests/CMakeLists.txt

Simple merge