CX merge

[Alexandre Julliard]

Steven Edwards <steven_ed4153 at yahoo.com> writes:

> How close are we to being done with the CrossOver merge? I have more
> ole32 to submit and want to merge the ReactOS stuff.

There's still lots of things to merge, but that shouldn't prevent you
from submitting your stuff. At worse, if there are conflicts you may
need to update and resubmit, but that shouldn't happen too often. As
far as ole32 is concerned I think I have merged everything now.

-- 
Alexandre Julliard
julliard at winehq.com