summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorClement Lefebvre <[email protected]>2015-09-18 10:36:01 +0100
committerClement Lefebvre <[email protected]>2015-09-18 10:36:01 +0100
commit5ca874a34650d3f9b44dcbd00eb219a9bf04a394 (patch)
treeb8c4e108e5e65c0df74a8391b7adb5e5b5acc1e7 /docs
parent57886d7a447ed010762879259beb97e81c0284ea (diff)
parentca724d9f8493639ef51e108fb0b8bef499207ffa (diff)
downloadmate-desktop-5ca874a34650d3f9b44dcbd00eb219a9bf04a394.tar.bz2
mate-desktop-5ca874a34650d3f9b44dcbd00eb219a9bf04a394.tar.xz
Merge branch 'master' of https://github.com/clefebvre/mate-desktop into clefebvre-master
Conflicts: configure.ac user-guide/mate-user-guide.desktop.in.in
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions