Merge remote-tracking branch 'oc/master' into master-oc
authorRoeland Jago Douma <roeland@famdouma.nl>
Wed, 23 Aug 2017 13:40:35 +0000 (15:40 +0200)
committerRoeland Jago Douma <roeland@famdouma.nl>
Wed, 23 Aug 2017 13:40:35 +0000 (15:40 +0200)
commitcdc5c1db43e9eebfde1b5f8428ad4d4ece988f3d
tree43cd96bdb40f6e9c75bc232b5e9ff8d9b32fb546
parent63d99f3e3074cca62dd799b8763916480906e690
parent5bf48bc68fb11d3d64412fa9a940799f09eb07f9
Merge remote-tracking branch 'oc/master' into master-oc
src/gui/folderstatusdelegate.cpp