summaryrefslogtreecommitdiff
path: root/libwindow-settings
diff options
context:
space:
mode:
authorraveit65 <chat-to-me@raveit.de>2015-08-26 13:01:22 +0200
committermonsta <monsta@inbox.ru>2015-10-02 11:59:21 +0300
commit83c87e2e90b73baf66a6eae5f71fc70f8fbc0428 (patch)
tree26ce06bac13593ad72275e5ff2421a18998a3909 /libwindow-settings
parentd7cdd7088e858161511cbb8f774040c9a9184f26 (diff)
downloadmate-control-center-83c87e2e90b73baf66a6eae5f71fc70f8fbc0428.tar.bz2
mate-control-center-83c87e2e90b73baf66a6eae5f71fc70f8fbc0428.tar.xz
Help: fix merge conflicts
Diffstat (limited to 'libwindow-settings')
0 files changed, 0 insertions, 0 deletions