minor merging errors

2014-09-15 15:59:50 +02:00 · 2014-09-15 15:59:50 +02:00 · 881735b562
parent db7c26cde7
commit 881735b562
2 changed files with 2 additions and 1 deletions
--- 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
+#endif
--- 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