diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-19 16:46:00 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-19 16:46:00 +0200 |
| commit | 3a5d7105589e39b43fe5e9256e8137d7e783141d (patch) | |
| tree | 6a0c9fda7110bbee1213b0d347e11c84a8266875 /data | |
| parent | f1a6c049e615f5739183d2558df9db5bca43cd68 (diff) | |
| parent | 05e2631353c9f9522564ca06efc8fc5ba3a863cb (diff) | |
Merge tag 'upstream/3.17.90'
Upstream version 3.17.90
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 1 | ||||
| -rw-r--r-- | data/Makefile.in | 1 | ||||
| -rw-r--r-- | data/appdata/Makefile.am | 1 | ||||
| -rw-r--r-- | data/appdata/Makefile.in | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 92af82f..e367c9e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -16,7 +16,6 @@ EXTRA_DIST = simple-scan.desktop.in \ simple-scan.gresource.xml DISTCLEANFILES = \ - Makefile.in \ $(schema_DATA) \ $(desktop_DATA) \ $(gsettings_SCHEMAS) diff --git a/data/Makefile.in b/data/Makefile.in index c997fbb..471f609 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -346,7 +346,6 @@ EXTRA_DIST = simple-scan.desktop.in \ simple-scan.gresource.xml DISTCLEANFILES = \ - Makefile.in \ $(schema_DATA) \ $(desktop_DATA) \ $(gsettings_SCHEMAS) diff --git a/data/appdata/Makefile.am b/data/appdata/Makefile.am index 4726d69..37b3e67 100644 --- a/data/appdata/Makefile.am +++ b/data/appdata/Makefile.am @@ -5,5 +5,4 @@ appdata_DATA = simple-scan.appdata.xml EXTRA_DIST = simple-scan.appdata.xml.in DISTCLEANFILES = \ - Makefile.in \ $(appdata_DATA) diff --git a/data/appdata/Makefile.in b/data/appdata/Makefile.in index b520fe1..ea56f50 100644 --- a/data/appdata/Makefile.in +++ b/data/appdata/Makefile.in @@ -276,7 +276,6 @@ appdatadir = $(datadir)/appdata appdata_DATA = simple-scan.appdata.xml EXTRA_DIST = simple-scan.appdata.xml.in DISTCLEANFILES = \ - Makefile.in \ $(appdata_DATA) all: all-am |