diff options
| author | Clement Lefebvre <[email protected]> | 2015-09-18 10:36:01 +0100 |
|---|---|---|
| committer | Clement Lefebvre <[email protected]> | 2015-09-18 10:36:01 +0100 |
| commit | 5ca874a34650d3f9b44dcbd00eb219a9bf04a394 (patch) | |
| tree | b8c4e108e5e65c0df74a8391b7adb5e5b5acc1e7 /po | |
| parent | 57886d7a447ed010762879259beb97e81c0284ea (diff) | |
| parent | ca724d9f8493639ef51e108fb0b8bef499207ffa (diff) | |
| download | mate-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 'po')
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | po/POTFILES.skip | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index 91613db..e6529a2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -35,4 +35,3 @@ libmate-desktop/mate-rr-labeler.c tools/mate-color-select.c tools/mate-color-select.desktop.in.in tools/mate-conf-import.desktop.in.in -user-guide/mate-user-guide.desktop.in.in diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 509df24..521cd52 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -5,4 +5,3 @@ mate-about/mate-about.desktop.in mate-version.xml.in tools/mate-color-select.desktop.in tools/mate-conf-import.desktop.in -user-guide/mate-user-guide.desktop.in |