Rebase against 6790d825d1b2c41de73ffe5cb5df28c1d1cc8878.

This commit is contained in:
Sebastian Lackner
2015-11-25 21:57:01 +01:00
parent 67b1817720
commit 6f9e2dae7d
9 changed files with 69 additions and 145 deletions

View File

@@ -9769,7 +9769,7 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -5530,9 +5530,15 @@
@@ -5553,9 +5553,15 @@
DebugBreak();
}