From 881735b56268e76ec8a4b817ebd3fa7601160c12 Mon Sep 17 00:00:00 2001 From: gabest11 Date: Mon, 15 Sep 2014 15:59:50 +0200 Subject: [PATCH] minor merging errors --- plugins/GSdx/res/shadeboost.fx | 2 +- plugins/GSdx/resource.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/GSdx/res/shadeboost.fx b/plugins/GSdx/res/shadeboost.fx index 5f3c2474a0..890a68a948 100644 --- a/plugins/GSdx/res/shadeboost.fx +++ b/plugins/GSdx/res/shadeboost.fx @@ -73,4 +73,4 @@ float4 ps_main(PS_INPUT input) : COLOR } #endif -#endif \ No newline at end of file +#endif diff --git a/plugins/GSdx/resource.h b/plugins/GSdx/resource.h index 24ed550f41..b6502c2aef 100644 --- a/plugins/GSdx/resource.h +++ b/plugins/GSdx/resource.h @@ -81,6 +81,7 @@ #define IDR_CS_FX 10006 #define IDD_SHADEBOOST 10007 #define IDR_SHADEBOOST_FX 10009 +#define IDR_TFX_CL 10010 #define IDD_HACKS 10011 #define IDC_STATIC -1