]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge branch 'Applications/17.12'
authorNathaniel Graham <pointedstick@zoho.com>
Wed, 31 Jan 2018 00:06:43 +0000 (17:06 -0700)
committerNathaniel Graham <pointedstick@zoho.com>
Wed, 31 Jan 2018 00:06:43 +0000 (17:06 -0700)
1  2 
src/dolphinmainwindow.cpp

Simple merge