d3d9/tests: Merge texture.c into device.c.

0c9713bb · Henri Verbeet · Alexandre Julliard · dd9efc98 · 0c9713bb · 0c9713bb
Commit 0c9713bb authored Jan 11, 2013 by Henri Verbeet Committed by Alexandre Julliard Jan 11, 2013
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

Makefile.in dlls/d3d9/tests/Makefile.in +0 -1

device.c dlls/d3d9/tests/device.c +0 -0

texture.c dlls/d3d9/tests/texture.c +0 -0

No files found.
--- a/dlls/d3d9/tests/Makefile.in
+++ b/dlls/d3d9/tests/Makefile.in
@@ -6,7 +6,6 @@ C_SRCS = \
 	device.c \
 	stateblock.c \
 	surface.c \
-	texture.c \
 	vertexdeclaration.c \
 	visual.c


--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
--- a/dlls/d3d9/tests/texture.c
+++ b/dlls/d3d9/tests/texture.c