summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'calculate.txt')
-rw-r--r--calculate.txt25
1 files changed, 24 insertions, 1 deletions
diff --git a/calculate.txt b/calculate.txt
index 135ba4298410..a8ddbfec9227 100644
--- a/calculate.txt
+++ b/calculate.txt
@@ -20,7 +20,30 @@ 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.
-Already up to date.
+From git://git.calculate-linux.org/calculate/calculate-overlay
+ 6123efc1a..f33074bdc master -> origin/master
+ 9aa54d804..f33074bdc develop -> origin/develop
+ 6123efc1a..f33074bdc master64 -> origin/master64
+ 9aa54d804..f33074bdc update -> origin/update
+ * [new tag] 2263 -> 2263
+Updating 6123efc1a..f33074bdc
+Fast-forward
+ profiles/default/package.keywords/depends | 4 ++++
+ profiles/default/package.keywords/games | 2 +-
+ profiles/default/package.keywords/kodi | 2 +-
+ profiles/default/package.use/abi_x86_32 | 3 ++-
+ .../3.6/2_ac_install_merge/dev-libs/openobex/.calculate_directory | 2 +-
+ profiles/templates/3.6/6_ac_update_sync/remerge/0-ini | 2 +-
+ profiles/templates/3.6/6_ac_update_sync/remerge/2020/20201123 | 7 +++++++
+ sys-kernel/calculate-sources/Manifest | 6 +++---
+ ...e-sources-4.19.154.ebuild => calculate-sources-4.19.159.ebuild} | 0
+ ...ulate-sources-5.4.74.ebuild => calculate-sources-5.4.79.ebuild} | 0
+ ...culate-sources-5.9.3.ebuild => calculate-sources-5.9.10.ebuild} | 0
+ 11 files changed, 20 insertions(+), 8 deletions(-)
+ create mode 100644 profiles/templates/3.6/6_ac_update_sync/remerge/2020/20201123
+ rename sys-kernel/calculate-sources/{calculate-sources-4.19.154.ebuild => calculate-sources-4.19.159.ebuild} (100%)
+ rename sys-kernel/calculate-sources/{calculate-sources-5.4.74.ebuild => calculate-sources-5.4.79.ebuild} (100%)
+ rename sys-kernel/calculate-sources/{calculate-sources-5.9.3.ebuild => calculate-sources-5.9.10.ebuild} (100%)
*** syncing calculate
*** synced calculate
* Sync succeeded