Commit 642eaf13 authored by Roozbeh Pournader's avatar Roozbeh Pournader Committed by Behdad Esfahbod
Browse files

Properly merge head.flags and OS/2.fsType 

Also install the merge script.
parent 95f795f4
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment