From 2ed49e24bac72e85de8bbc68151b49514ec0204b Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sat, 22 Aug 2020 18:55:43 +0000 Subject: [PATCH] - Legacy-Id: 18404 --- hold-for-merge | 6 ++++++ ready-for-merge | 2 ++ 2 files changed, 8 insertions(+) diff --git a/hold-for-merge b/hold-for-merge index f1d593eac..3dd97abaa 100644 --- a/hold-for-merge +++ b/hold-for-merge @@ -1,5 +1,11 @@ # -*- conf-mode -*- +/personal/lars/7.12.1.dev0@18335 +/personal/lars/7.12.1.dev0@18330 # Merge attempted but needed re-working; some cherry-picking done +/personal/lars/7.12.1.dev0@18329 +/personal/lars/7.12.1.dev0@18328 +/personal/lars/7.12.1.dev0@18327 + /personal/markd/v6.127.1.dev1@17694 # Review still shows issues, henrik will rework (29 Apr 2020) /personal/markd/v6.120.0.dev0@17570 # Review issues to be resolved (08 Apr 2020) /personal/mahoney/6.121.1.dev0@17473 # Test commit diff --git a/ready-for-merge b/ready-for-merge index 9486c1bc7..992b7b515 100644 --- a/ready-for-merge +++ b/ready-for-merge @@ -7,6 +7,8 @@ # --- Add entries at the top --- +/personal/lars/7.12.1.dev0@18326 + /personal/housley/7.10.1.dev0@18276 /personal/valery/7.10.1.dev0@18271 /personal/valery/7.10.1.dev0@18270