ddraw: Merge texture.c into surface.c.

407f78e9 · Henri Verbeet · Alexandre Julliard · 3eba8b5d · 407f78e9 · 407f78e9
Commit 407f78e9 authored Aug 18, 2010 by Henri Verbeet Committed by Alexandre Julliard Aug 19, 2010
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

Makefile.in dlls/ddraw/Makefile.in +0 -1

surface.c dlls/ddraw/surface.c +0 -0

texture.c dlls/ddraw/texture.c +0 -0

No files found.
--- a/dlls/ddraw/Makefile.in
+++ b/dlls/ddraw/Makefile.in
@@ -18,7 +18,6 @@ C_SRCS = \
 	parent.c \
 	regsvr.c \
 	surface.c \
-	texture.c \
 	utils.c \
 	vertexbuffer.c \
 	viewport.c

--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
--- a/dlls/ddraw/texture.c
+++ b/dlls/ddraw/texture.c