project: Update for 5.2.5 merge.

SMP/SMP.patch

@@ -1,18 +1,18 @@
 diff --git a/po/it.po b/po/it.po
-index dc1cfbf2..d1ca3de9 100644
+index 2b7afbd..0e0f0d8 100644
 --- a/po/it.po
 +++ b/po/it.po
-@@ -15,7 +15,7 @@ msgstr ""
- "Language: it\n"
+@@ -16,7 +16,7 @@ msgstr ""
+ "X-Bugs: Report translation errors to the Language-Team address.\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
 -"Content-Transfer-Encoding: 8bit\n"
 +"Content-Transfer-Encoding: 8-bit\n"
  "X-Launchpad-Export-Date: 2010-08-16 19:16+0000\n"
- "X-Generator: Poedit 1.6.10\n"
+ "X-Generator: Poedit 2.2.1\n"
  "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 diff --git a/src/common/mythread.h b/src/common/mythread.h
-index be226542..a305aef3 100644
+index be22654..a305aef 100644
 --- a/src/common/mythread.h
 +++ b/src/common/mythread.h
 @@ -331,8 +331,10 @@ mythread_condtime_set(mythread_condtime *condtime, const mythread_cond *cond,
@@ -29,7 +29,7 @@ index be226542..a305aef3 100644
  #include <windows.h>
  #include <process.h>
 diff --git a/src/common/tuklib_cpucores.c b/src/common/tuklib_cpucores.c
-index c16e188d..93f66b09 100644
+index cc968dd..36f414a 100644
 --- a/src/common/tuklib_cpucores.c
 +++ b/src/common/tuklib_cpucores.c
 @@ -14,7 +14,9 @@
@@ -43,50 +43,8 @@ index c16e188d..93f66b09 100644
  #	endif
  #	include <windows.h>
 
-diff --git a/src/common/tuklib_integer.h b/src/common/tuklib_integer.h
-index b1e84d5c..1e7b9027 100644
---- a/src/common/tuklib_integer.h
-+++ b/src/common/tuklib_integer.h
-@@ -97,6 +97,10 @@
- #	endif
- #endif
-
-+#if defined(_MSC_VER) && _MSC_VER >= 1400
-+#   include <intrin.h>
-+#endif
-+
-
- ////////////////////////////////
- // Compiler-specific features //
-@@ -394,7 +398,7 @@ bsr32(uint32_t n)
- 	// MSVC isn't supported by tuklib, but since this code exists,
- 	// it doesn't hurt to have it here anyway.
- 	uint32_t i;
--	_BitScanReverse((DWORD *)&i, n);
-+	_BitScanReverse((unsigned long *)&i, n);
- 	return i;
-
- #else
-@@ -446,7 +450,7 @@ clz32(uint32_t n)
-
- #elif defined(_MSC_VER) && _MSC_VER >= 1400
- 	uint32_t i;
--	_BitScanReverse((DWORD *)&i, n);
-+	_BitScanReverse((unsigned long *)&i, n);
- 	return i ^ 31U;
-
- #else
-@@ -496,7 +500,7 @@ ctz32(uint32_t n)
-
- #elif defined(_MSC_VER) && _MSC_VER >= 1400
- 	uint32_t i;
--	_BitScanForward((DWORD *)&i, n);
-+	_BitScanForward((unsigned long *)&i, n);
- 	return i;
-
- #else
 diff --git a/src/common/tuklib_physmem.c b/src/common/tuklib_physmem.c
-index 4053ad00..a07fd701 100644
+index 4053ad0..a07fd70 100644
 --- a/src/common/tuklib_physmem.c
 +++ b/src/common/tuklib_physmem.c
 @@ -17,7 +17,9 @@