diff options
| author | Martin Wimpress <[email protected]> | 2015-06-27 22:14:24 +0100 |
|---|---|---|
| committer | Martin Wimpress <[email protected]> | 2015-06-27 22:14:24 +0100 |
| commit | e64c0d6d99fe6aef817af0b18e53d9813cb2c11f (patch) | |
| tree | ea972a0ed2ab0677aa1578eef5809d8730af21e9 /mate-panel/panel-xutils.h | |
| parent | 9978fdd46962be0acfcfddfb489b19f949f88bb4 (diff) | |
| parent | bcc8a11e05c9e1479e71d1696084e9e509fe2e92 (diff) | |
| download | mate-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 'mate-panel/panel-xutils.h')
0 files changed, 0 insertions, 0 deletions