From 282ae20a9d1c03e053931363cfaa16dc07948c60 Mon Sep 17 00:00:00 2001 From: Oliver Bock Date: Tue, 8 Jan 2013 16:03:46 +0100 Subject: [PATCH 1/2] Added additional parent mappings --- boinc-parentmap | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/boinc-parentmap b/boinc-parentmap index bf4af47..2cecd52 100644 --- a/boinc-parentmap +++ b/boinc-parentmap @@ -42,8 +42,18 @@ # merge from trunk to 5.2 8685 8687 +# merge from trunk to 6.8 +19738 19751 +20242 20243 +19046 23630 + +# merge from trunk to 6.10 +19046 19047 + # merge from trunk to 7.0a 25434 25435 +25477 25478 +25503 25504 # merges from server_stable to trunk # (when bugfixes were done on both, From 95b027117ee3c9ab6950d4538cdea3eb78d43719 Mon Sep 17 00:00:00 2001 From: Oliver Bock Date: Tue, 8 Jan 2013 16:09:17 +0100 Subject: [PATCH 2/2] Improved PyMW parent mapping (moves 15660 into a more accurate position) --- boinc-parentmap | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boinc-parentmap b/boinc-parentmap index 2cecd52..3806197 100644 --- a/boinc-parentmap +++ b/boinc-parentmap @@ -32,9 +32,9 @@ 15505 15506 # merge kadam's PyMW stuff to trunk -# This merge was done in a messy way, so these parent links aren't accurate. -15660 15679 -15681 15702 +# This merge was done in a messy way, so these parent links might not be accurate. +15659 15679 +15660 15702 # Merge samples into trunk 15692 15730