On Thu, Mar 15, 2012 at 02:13:35AM +0100, Marc-André Lureau wrote:
EOL is different, your patches are unix EOL, the files are dos EOL.
> ---
> client/Makefile.am |6 +--
> client/demarshallers.h | 27 --
> client/marshallers.h | 63
> -
On Thu, Mar 15, 2012 at 02:13:35AM +0100, Marc-André Lureau wrote:
The failures when applying "by hand":
patching file client/windows/generate.bat
Hunk #1 NOT MERGED at 1-5.
patching file client/windows/generate1.bat
patching file client/windows/redc.vcproj
Hunk #1 NOT MERGED at 695-705.
> ---
>
On Thu, Mar 15, 2012 at 02:13:35AM +0100, Marc-André Lureau wrote:
This last patch doesn't apply on top of master. Last commit:
914e508 red_worker: Check for NULL watches
> ---
> client/Makefile.am |6 +--
> client/demarshallers.h | 27 --
> client/marshal
On Thu, Mar 15, 2012 at 02:13:35AM +0100, Marc-André Lureau wrote:
Arnon, could you test this? it touched the vcproj file, I don't have a
build environment atm. Thanks.
> ---
> client/Makefile.am |6 +--
> client/demarshallers.h | 27 --
> client/marshallers
---
client/Makefile.am |6 +--
client/demarshallers.h | 27 --
client/marshallers.h | 63 --
client/red_channel.h |4 +-
client/red_client.cpp|2 +-
client/windows/generate.bat |2 +