Henri Verbeet : d3d9: Merge cubetexture.c into texture.c.

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Mon Apr 23 21:24:57 2012 +0200

d3d9: Merge cubetexture.c into texture.c.

---

 dlls/d3d9/Makefile.in   |    1 -
 dlls/d3d9/cubetexture.c |  481 -----------------------------------------------
 dlls/d3d9/texture.c     |  446 +++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 444 insertions(+), 484 deletions(-)

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