Henri Verbeet : wined3d: Merge baseshader.c into shader.c.

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Sun Jan 17 21:31:32 2010 +0100

wined3d: Merge baseshader.c into shader.c.

---

 dlls/wined3d/Makefile.in       |    1 -
 dlls/wined3d/baseshader.c      | 1444 ----------------------------------------
 dlls/wined3d/shader.c          | 1400 ++++++++++++++++++++++++++++++++++++++
 dlls/wined3d/wined3d_private.h |   12 -
 4 files changed, 1400 insertions(+), 1457 deletions(-)

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