Rebase against 5101a90bca2bd2618b488f37624af43efe17a0e0.

[secur32-Gnutls_Algorithms]
Removed patch to define missing gnutls_kx_algorithm_t values for old gnutls
versions (accepted upstream).

[taskmgr-Memory_Usage]
Removed patch to use sysinfo to report correct number of physical pages
(accepted upstream).
This commit is contained in:
Sebastian Lackner
2016-07-14 19:26:24 +02:00
parent 31baacffe2
commit f788007dc4
4 changed files with 4 additions and 113 deletions

View File

@@ -3878,7 +3878,7 @@ diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -3057,7 +3057,11 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3
@@ -3036,7 +3036,11 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3
UINT i;
memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */