Henri Verbeet : ddraw: Merge direct3d.c into ddraw.c.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8394f0066144cbc7fe5634698fe6dafecf92aa27
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8394f0066144cbc7fe5634698f...

Author: Henri Verbeet 
Date:   Tue Aug 17 19:03:22 2010 +0200

ddraw: Merge direct3d.c into ddraw.c.

---

dlls/ddraw/Makefile.in |    1 -
 dlls/ddraw/ddraw.c     | 1389 +++++++++++++++++++++++++++++++++++++++++
 dlls/ddraw/direct3d.c  | 1608 ------------------------------------------------
 3 files changed, 1389 insertions(+), 1609 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=8394f0066144cbc7fe5634...