diff options
author | raveit65 <[email protected]> | 2015-08-26 13:01:22 +0200 |
---|---|---|
committer | infirit <[email protected]> | 2015-08-29 12:01:19 +0200 |
commit | f840fc05ba1178838c1c163f1ed3908a927ba447 (patch) | |
tree | 8d9802d11c5870dc0a232cfbf99b7b4e15e3936c /libwindow-settings/mate-wm-manager.c | |
parent | 7cb9010fc3e01e23f0b4ae3d3415949201427094 (diff) | |
download | mate-control-center-f840fc05ba1178838c1c163f1ed3908a927ba447.tar.bz2 mate-control-center-f840fc05ba1178838c1c163f1ed3908a927ba447.tar.xz |
Help: fix merge conflicts
Diffstat (limited to 'libwindow-settings/mate-wm-manager.c')
0 files changed, 0 insertions, 0 deletions