Merge pull request #24 from brevilo/parentmap-additions

Parentmap additions
BOINC · Jan 8, 2013 · 08b55d3 · 08b55d3
2 parents aed270c + 95b0271
commit 08b55d3
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/boinc-parentmap b/boinc-parentmap
@@ -32,18 +32,28 @@
 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
 
 # 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,