summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2015-08-26 13:01:22 +0200
committerinfirit <[email protected]>2015-08-29 12:01:19 +0200
commitf840fc05ba1178838c1c163f1ed3908a927ba447 (patch)
tree8d9802d11c5870dc0a232cfbf99b7b4e15e3936c /man
parent7cb9010fc3e01e23f0b4ae3d3415949201427094 (diff)
downloadmate-control-center-f840fc05ba1178838c1c163f1ed3908a927ba447.tar.bz2
mate-control-center-f840fc05ba1178838c1c163f1ed3908a927ba447.tar.xz
Help: fix merge conflicts
Diffstat (limited to 'man')
0 files changed, 0 insertions, 0 deletions