On Mon, 02 Sep 2013 15:55:18 +0200 Stefan Dösinger <stefandoesin...@gmail.com> wrote:
> You can test the attached patches by applying them (git am > /path/to/patches/*) Third patch doesn't apply: Applying: wined3d: Don't mess with the device in buffer_create_buffer_object Applying: wined3d: Don't mess with the device in buffer_get_sysmem Applying: wined3d: Pass the context to the main buffer preload function error: patch failed: dlls/wined3d/buffer.c:732 error: dlls/wined3d/buffer.c: patch does not apply Patch failed at 0003 wined3d: Pass the context to the main buffer preload function The copy of the patch that failed is found in: /home/dimesio/wine-git/.git/rebase-apply/patch When you have resolved this problem, run "git am --resolved". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". -- Rosanne DiMesio <dime...@earthlink.net>
