[wide-int] Resolve merge conflicts.

Here are some soft merge conflict resolutions…. Ok? Index: ChangeLog.wide-int === --- ChangeLog.wide-int (revision 206027) +++ ChangeLog.wide-int (working copy) @@ -340,6 +340,9 @@ * hooks.c (hook_bool_dint_dint_uin

Re: [wide-int] Resolve merge conflicts.

On Dec 13, 2013, at 11:16 AM, Mike Stump wrote: > Here are some soft merge conflict resolutions…. > > I've checked them in to fix the build. So, this let's us get farther… Ok? Index: ChangeLog.wide-int === --- ChangeLog.wide-int

[wide-int] Resolve merge conflicts.

Here are some soft merge conflict resolutions…. I've checked them in to fix the build. Ok? Index: ChangeLog.wide-int === --- ChangeLog.wide-int (revision 205969) +++ ChangeLog.wide-int (working copy) @@ -524,6 +524,7 @@ (a