diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-26 15:04:55 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-26 15:04:55 +0000 |
commit | 8b74e730b383820b058f9ed069d6ea5b88d8a373 (patch) | |
tree | e251e2191613266d65e09657558ed893629775af /calculate.txt | |
parent | 2021-04-26T14:45:01Z (diff) | |
download | repos-8b74e730b383820b058f9ed069d6ea5b88d8a373.tar.gz repos-8b74e730b383820b058f9ed069d6ea5b88d8a373.tar.bz2 repos-8b74e730b383820b058f9ed069d6ea5b88d8a373.zip |
2021-04-26T15:00:01Z
Diffstat (limited to 'calculate.txt')
-rw-r--r-- | calculate.txt | 83 |
1 files changed, 1 insertions, 82 deletions
diff --git a/calculate.txt b/calculate.txt index 53753205d750..7a4756b42bcf 100644 --- a/calculate.txt +++ b/calculate.txt @@ -21,88 +21,7 @@ preference for all repositories. You can also pass --rebase, --no-rebase, or --ff-only on the command line to override the configured default per invocation. -From git://git.calculate-linux.org/calculate/calculate-overlay - 35e9bae67..7298f8c78 master -> origin/master - 7bb5741bc..7298f8c78 develop -> origin/develop - 35e9bae67..7298f8c78 master64 -> origin/master64 - 7bb5741bc..7298f8c78 mhiretskiy -> origin/mhiretskiy - 7bb5741bc..7298f8c78 update -> origin/update - * [new tag] 2446 -> 2446 -Updating 35e9bae67..7298f8c78 -Fast-forward - .../app-text/evince/mimeapps.list | 7 + - .../www-client/firefox/firefox-wayland.desktop | 6 + - .../www-client/firefox/firefox-x11.desktop | 6 + - .../100-Browser/10-firefox/install/mimeapps.list | 14 ++ - .../100-Browser/20-chromium/install/mimeapps.list | 14 ++ - .../100-Browser/30-qupzilla/install/mimeapps.list | 14 ++ - .../100-Browser/40-opera/install/mimeapps.list | 14 ++ - .../100-Browser/50-epiphany/install/mimeapps.list | 14 ++ - .../60-qutebrowser/install/mimeapps.list | 14 ++ - .../zzz-Desktop/100-Browser/mimeapps.list | 14 ++ - .../110-Mail/10-kmail/install/mimeapps.list | 3 + - .../110-Mail/20-evolution/install/mimeapps.list | 5 +- - .../110-Mail/30-claws-mail/install/mimeapps.list | 3 + - .../110-Mail/40-trojita/install/mimeapps.list | 3 + - .../zzz-Desktop/110-Mail/mimeapps.list | 3 + - .../10-libreoffice/install/mimeapps.list | 4 + - .../15-libreoffice-bin/install/mimeapps.list | 4 + - .../zzz-Desktop/200-Writer/mimeapps.list | 4 + - .../210-Calc/10-libreoffice/install/mimeapps.list | 5 +- - .../15-libreoffice-bin/install/mimeapps.list | 5 +- - .../zzz-Desktop/210-Calc/mimeapps.list | 3 + - .../300-ImageEdit/10-gimp/install/mimeapps.list | 3 + - .../zzz-Desktop/300-ImageEdit/mimeapps.list | 3 + - .../10-gwenview/install/mimeapps.list | 62 ++++--- - .../320-ImageView/20-eom/install/mimeapps.list | 22 +++ - .../320-ImageView/30-eog/install/eog-2.30.desktop | 2 +- - .../320-ImageView/30-eog/install/mimeapps.list | 62 ++++--- - .../320-ImageView/40-nomacs/install/mimeapps.list | 62 ++++--- - .../40-nomacs/install/nomacs-1.6.desktop | 6 - - .../40-nomacs/install/nomacs-3.16.desktop | 6 + - .../320-ImageView/50-geeqie/install/mimeapps.list | 22 +++ - .../60-lximage-qt/install/mimeapps.list | 22 +++ - .../320-ImageView/70-mirage/install/mimeapps.list | 22 +++ - .../zzz-Desktop/320-ImageView/mimeapps.list | 22 +++ - .../10-amarok/install/mimeapps.list | 7 + - .../20-clementine/install/mimeapps.list | 7 + - .../30-audacious/install/mimeapps.list | 7 + - .../40-rhythmbox/install/mimeapps.list | 7 + - .../zzz-Desktop/400-AudioPlayer/mimeapps.list | 7 + - .../500-VideoPlayer/10-totem/install/mimeapps.list | 29 +++- - .../20-smplayer/install/mimeapps.list | 11 ++ - .../30-gnome-mplayer/install/mimeapps.list | 11 ++ - .../zzz-Desktop/500-VideoPlayer/mimeapps.list | 11 ++ - .../600-ImageBurn/10-k3b/install/mimeapps.list | 3 + - .../600-ImageBurn/20-brasero/install/mimeapps.list | 3 + - .../600-ImageBurn/30-xfburn/install/mimeapps.list | 3 + - .../zzz-Desktop/600-ImageBurn/mimeapps.list | 3 + - .../800-TextEdit/10-kwrite/install/mimeapps.list | 5 +- - .../800-TextEdit/20-gedit/install/mimeapps.list | 5 +- - .../800-TextEdit/30-pluma/install/mimeapps.list | 3 + - .../800-TextEdit/40-leafpad/install/mimeapps.list | 3 + - .../50-featherpad/install/mimeapps.list | 3 + - .../zzz-Desktop/800-TextEdit/mimeapps.list | 3 + - .../900-Terminal/10-konsole/install/mimeapps.list | 1 - - .../20-gnome-terminal/install/mimeapps.list | 1 - - .../30-mate-terminal/install/mimeapps.list | 1 - - .../40-xfce4-terminal/install/mimeapps.list | 1 - - .../50-qterminal/install/mimeapps.list | 1 - - .../zzz-Desktop/900-Terminal/mimeapps.list | 1 - - .../zzz-Desktop/999-PDFReader/10-qpdfview/install | 3 + - .../zzz-Desktop/999-PDFReader/mimeapps.list | 3 + - .../3.6/6_ac_update_sync/remerge/2021/20210426 | 4 + - .../calculate-server-2.1.20-r3.ebuild | 193 +++++++++++++++++++++ - .../files/calculate-server-2.1.20-fix_pam.patch | 25 +++ - 64 files changed, 753 insertions(+), 87 deletions(-) - create mode 100644 profiles/templates/3.6/2_ac_install_merge/app-text/evince/mimeapps.list - create mode 100644 profiles/templates/3.6/2_ac_install_merge/www-client/firefox/firefox-wayland.desktop - create mode 100644 profiles/templates/3.6/2_ac_install_merge/www-client/firefox/firefox-x11.desktop - delete mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/nomacs-1.6.desktop - create mode 100644 profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/nomacs-3.16.desktop - create mode 100644 profiles/templates/3.6/6_ac_update_sync/remerge/2021/20210426 - create mode 100644 sys-apps/calculate-server/calculate-server-2.1.20-r3.ebuild - create mode 100644 sys-apps/calculate-server/files/calculate-server-2.1.20-fix_pam.patch +Already up to date. *** synced calculate * Sync succeeded $ git log --format=%ci -1 |