ddraw: Merge direct3d.c into ddraw.c.

8394f006 · Henri Verbeet · Alexandre Julliard · f06b22a5 · 8394f006 · 8394f006
Commit 8394f006 authored Aug 17, 2010 by Henri Verbeet Committed by Alexandre Julliard Aug 18, 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

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

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

No files found.
--- a/dlls/ddraw/Makefile.in
+++ b/dlls/ddraw/Makefile.in
@@ -10,7 +10,6 @@ C_SRCS = \
 	clipper.c \
 	ddraw.c \
 	device.c \
-	direct3d.c \
 	executebuffer.c \
 	gamma.c \
 	light.c \

--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
--- a/dlls/ddraw/direct3d.c
+++ b/dlls/ddraw/direct3d.c