summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorMartin Wimpress <[email protected]>2015-06-27 22:14:24 +0100
committerMartin Wimpress <[email protected]>2015-06-27 22:14:24 +0100
commite64c0d6d99fe6aef817af0b18e53d9813cb2c11f (patch)
treeea972a0ed2ab0677aa1578eef5809d8730af21e9 /README
parent9978fdd46962be0acfcfddfb489b19f949f88bb4 (diff)
parentbcc8a11e05c9e1479e71d1696084e9e509fe2e92 (diff)
downloadmate-panel-e64c0d6d99fe6aef817af0b18e53d9813cb2c11f.tar.bz2
mate-panel-e64c0d6d99fe6aef817af0b18e53d9813cb2c11f.tar.xz
Merge pull request #315 from NiceandGently/master
help: clock and fish: fix merge conflicts during build
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions