Mercurial > hg > forks > geeqie
changeset 2906:fcfb8b820b85
Merge merge requests 641, 638, 630 and 627
Just pro forma as they are already in the history.
* github/merge-requests/641:
Add export-jpg to POTFILES.in
* github/merge-requests/638:
Avoid non-portable == for the test command
* github/merge-requests/630:
add headline field
* github/merge-requests/627:
Add awk shebang to geocode-parameters.awk
| author | Klaus Ethgen <Klaus@Ethgen.de> |
|---|---|
| date | Tue, 05 Feb 2019 21:18:18 +0100 |
| parents | b0b3e1948746 (diff) 7e769ff09997 (current diff) |
| children | a805689b5f6c |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.mailmap Tue Feb 05 21:18:18 2019 +0100 +++ b/.mailmap Tue Feb 05 21:18:18 2019 +0100 @@ -6,6 +6,8 @@ <mschwendt@fedoraproject.org> <mschwendt@gmail.com> <michal@cihar.com> <mcihar@suse.cz> <michal@cihar.com> <nijel@debian.org> -<jrs+git@weitnahbei.de> J. R. Schmid <sixtyfive@users.noreply.github.com> +<jrs+git@weitnahbei.de> <sixtyfive@users.noreply.github.com> Morgan Hardwood <entertheyoni@gmail.com> Rezső Páder <rezso@rezso.net> +Olaf Seibert <rhialto@falu.nl> <> +<niko@nava.de> <nikoss@users.noreply.github.com>
--- a/po/POTFILES.in Tue Feb 05 21:18:18 2019 +0100 +++ b/po/POTFILES.in Tue Feb 05 21:18:18 2019 +0100 @@ -1,6 +1,7 @@ geeqie.desktop.in plugins/import/geeqie-import-geeqie.desktop.in plugins/import/geeqie-import-gqview.desktop.in +plugins/export-jpeg/export-jpeg.desktop.in plugins/rotate/rotate.desktop.in plugins/symlink/symlink.desktop.in plugins/ufraw/geeqie-ufraw.desktop.in