Matteo Bruni : d3dx9: Merge "main" source files.

[Alexandre Julliard]

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

Author: Matteo Bruni <mbruni at codeweavers.com>
Date:   Thu Dec  7 22:56:13 2017 +0100

d3dx9: Merge "main" source files.

Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/d3dx9_24/Makefile.in                 |  3 +-
 dlls/d3dx9_24/d3dx9_24_main.c             | 60 ------------------------
 dlls/d3dx9_25/Makefile.in                 |  4 +-
 dlls/d3dx9_25/d3dx9_25_main.c             | 60 ------------------------
 dlls/d3dx9_26/Makefile.in                 |  3 +-
 dlls/d3dx9_26/d3dx9_26_main.c             | 60 ------------------------
 dlls/d3dx9_27/Makefile.in                 |  3 +-
 dlls/d3dx9_27/d3dx9_27_main.c             | 60 ------------------------
 dlls/d3dx9_28/Makefile.in                 |  4 +-
 dlls/d3dx9_28/d3dx9_28_main.c             | 60 ------------------------
 dlls/d3dx9_29/Makefile.in                 |  4 +-
 dlls/d3dx9_29/d3dx9_29_main.c             | 60 ------------------------
 dlls/d3dx9_30/Makefile.in                 |  3 +-
 dlls/d3dx9_30/d3dx9_30_main.c             | 77 -------------------------------
 dlls/d3dx9_31/Makefile.in                 |  3 +-
 dlls/d3dx9_31/d3dx9_31_main.c             | 60 ------------------------
 dlls/d3dx9_32/Makefile.in                 |  3 +-
 dlls/d3dx9_32/d3dx9_32_main.c             | 61 ------------------------
 dlls/d3dx9_33/Makefile.in                 |  3 +-
 dlls/d3dx9_33/d3dx9_33_main.c             | 62 -------------------------
 dlls/d3dx9_34/Makefile.in                 |  3 +-
 dlls/d3dx9_34/d3dx9_34_main.c             | 60 ------------------------
 dlls/d3dx9_35/Makefile.in                 |  3 +-
 dlls/d3dx9_35/d3dx9_35_main.c             | 60 ------------------------
 dlls/d3dx9_36/Makefile.in                 |  3 +-
 dlls/d3dx9_36/{d3dx9_36_main.c => main.c} | 22 ++++-----
 dlls/d3dx9_37/Makefile.in                 |  3 +-
 dlls/d3dx9_37/d3dx9_37_main.c             | 60 ------------------------
 dlls/d3dx9_38/Makefile.in                 |  3 +-
 dlls/d3dx9_38/d3dx9_38_main.c             | 60 ------------------------
 dlls/d3dx9_39/Makefile.in                 |  3 +-
 dlls/d3dx9_39/d3dx9_39_main.c             | 60 ------------------------
 dlls/d3dx9_40/Makefile.in                 |  3 +-
 dlls/d3dx9_40/d3dx9_40_main.c             | 61 ------------------------
 dlls/d3dx9_41/Makefile.in                 |  3 +-
 dlls/d3dx9_41/d3dx9_41_main.c             | 61 ------------------------
 dlls/d3dx9_42/Makefile.in                 |  3 +-
 dlls/d3dx9_42/d3dx9_42_main.c             | 62 -------------------------
 dlls/d3dx9_43/Makefile.in                 |  3 +-
 dlls/d3dx9_43/d3dx9_43_main.c             | 61 ------------------------
 include/d3dx9core.h                       |  4 +-
 41 files changed, 51 insertions(+), 1203 deletions(-)

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