[pkg-wine-party] [wine] 31/34: Merge branch 'upstream'
This is an automated email from the git hooks/post-receive script.
jreyer-guest pushed a commit to branch master
in repository wine.
commit f29d9508172c99805e03c214da5336d65ad9e779
Merge: a50f47e 5606512
Author: Jens Reyer <jre.winesim@gmail.com>
Date: Tue Jan 16 20:45:56 2018 +0100
Merge branch 'upstream'
ANNOUNCE | 184 +++++++++-----------------
VERSION | 2 +-
configure | 18 +--
dlls/bcrypt/bcrypt_main.c | 4 +-
dlls/comctl32/tests/imagelist.c | 267 ++++++++++++++++++++++----------------
dlls/d3dx9_36/tests/effect.c | 43 +++---
dlls/d3dx9_36/tests/mesh.c | 26 ++--
dlls/ddraw/tests/ddraw1.c | 67 +++++-----
dlls/ddraw/tests/ddraw2.c | 67 +++++-----
dlls/ddraw/tests/ddraw4.c | 59 +++++----
dlls/ddraw/tests/ddraw7.c | 230 ++++++++++++++++----------------
dlls/hlink/tests/hlink.c | 4 +-
dlls/kernel32/tests/loader.c | 131 +++++++++++++++----
dlls/kernel32/tests/virtual.c | 22 +++-
dlls/mlang/tests/mlang.c | 6 +-
dlls/msvcr80/msvcr80.spec | 6 +-
dlls/msvcrt/data.c | 49 ++++---
dlls/msvcrt/math.c | 36 ++++-
dlls/msvcrt/msvcrt.spec | 6 +-
dlls/msxml3/tests/domdoc.c | 1 +
dlls/ntdll/loader.c | 2 +-
dlls/ntdll/ntdll_misc.h | 2 +-
dlls/ntdll/thread.c | 5 +-
dlls/ntdll/virtual.c | 7 +-
dlls/quartz/tests/filtergraph.c | 1 +
dlls/scrrun/tests/filesystem.c | 40 +++---
dlls/shell32/shellpath.c | 5 +-
dlls/shell32/tests/shellpath.c | 26 ++--
dlls/taskschd/folder_collection.c | 1 +
dlls/user32/tests/dialog.c | 198 +++++++++++++++++++++++++++-
dlls/user32/tests/input.c | 6 +-
dlls/usp10/tests/usp10.c | 2 +
include/winternl.h | 2 +-
33 files changed, 946 insertions(+), 579 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git
Reply to: