Rebase against 9586d3b2567e6b4a2270caeacf39796c168351c0.

This commit is contained in:
Sebastian Lackner
2015-05-21 18:47:14 +02:00
parent b2297b41c3
commit ca8ffcd619
20 changed files with 127 additions and 609 deletions

View File

@@ -9605,7 +9605,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
@@ -5323,9 +5323,15 @@
@@ -5325,9 +5325,15 @@
DebugBreak();
}