Skip to content
This repository has been archived by the owner on Jul 12, 2018. It is now read-only.

Parentmap additions #24

Merged
merged 2 commits into from
Jan 8, 2013
Merged

Parentmap additions #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
282ae20
Added additional parent mappings
Jan 8, 2013
95b0271
Improved PyMW parent mapping (moves 15660 into a more accurate position)
Jan 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions boinc-parentmap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down