Henri Verbeet : wined3d: Merge surface_base.c into surface.c.

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Mon Apr 25 22:54:13 2011 +0200

wined3d: Merge surface_base.c into surface.c.

---

 dlls/wined3d/Makefile.in       |    1 -
 dlls/wined3d/surface.c         | 1959 +++++++++++++++++++++++++++++++++++++++-
 dlls/wined3d/surface_base.c    | 1953 ---------------------------------------
 dlls/wined3d/wined3d_private.h |   46 -
 4 files changed, 1956 insertions(+), 2003 deletions(-)

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