Merge UnkoTim220

diff --cc interface/w32g_res.h
Simple merge

diff --cc interface/w32g_res.rc
Simple merge

diff --cc timidity/int_synth.h
Simple merge

diff --cc timidity/optcode.h
index fc1e0af,0eee6e8..c1708f7
mode 100644,100755..100644
--- 1/timidity/optcode.h
--- 2/timidity/optcode.h
+++ b/timidity/optcode.h
@@@ -982,9 -985,10 +982,9 @@@ static TIMIDITY_FORCEINLINE __m128i mm_
  
  static TIMIDITY_FORCEINLINE void mm_i32scatter_i32_impl(void *base, __m128i offset, __m128i val, int scale)
  {
 -      int i;
        ALIGN16 int32 buf[4];
        _mm_store_si128((__m128i *)buf, val);
- 
+       {
        __m128i byte_offset = _mm_mullo_epi32(offset, _mm_set1_epi32(scale));
  #ifdef IX64CPU
        __m128i vbase = _mm_set1_epi64x((int64)base);

diff --cc timidity/smplfile.c
index f243076,dcf9273..f243076
mode 100755,100755..100644
--- 1/timidity/smplfile.c
--- 2/timidity/smplfile.c
+++ b/timidity/smplfile.c

diff --cc timidity/w32g_ogg_dll.c
index 0342e5e,538fdf1..0410a9a
--- 1/timidity/w32g_ogg_dll.c
--- 2/timidity/w32g_ogg_dll.c
+++ b/timidity/w32g_ogg_dll.c
@@@ -25,8 -25,10 +25,9 @@@
  #ifdef HAVE_CONFIG_H\r
  #include "config.h"\r
  #endif /* HAVE_CONFIG_H */\r
 -#include "interface.h"\r
 -#include "common.h"\r
 +\r
  \r
+ \r
  #if defined(AU_VORBIS_DLL) || defined(AU_OPUS_DLL)\r
  \r
  #include <windows.h>\r