This is an automated email from the git hooks/post-receive script. jreyer-guest pushed a commit to branch master in repository wine.
commit c981bc4848bb0f15002e3312fb3406985aeff48b Merge: 0d5c516 cf7451a Author: Jens Reyer <[email protected]> Date: Thu Jan 18 17:09:19 2018 +0100 Merge branch 'upstream' .mailmap | 1 + ANNOUNCE | 204 +++- LICENSE | 2 +- VERSION | 2 +- configure | 18 +- dlls/advapi32/service.c | 6 +- dlls/advapi32/tests/eventlog.c | 2 +- dlls/advapi32/tests/registry.c | 6 + .../api-ms-win-crt-convert-l1-1-0.spec | 2 +- dlls/comctl32/tests/combo.c | 2 +- dlls/comctl32/tests/taskdialog.c | 2 +- dlls/d3d8/tests/device.c | 52 +- dlls/d3d8/tests/visual.c | 218 ++++ dlls/d3d9/tests/visual.c | 218 ++++ dlls/d3dx9_36/tests/math.c | 126 +- dlls/ddraw/tests/ddraw1.c | 137 ++- dlls/ddraw/tests/ddraw2.c | 135 ++- dlls/ddraw/tests/ddraw4.c | 348 +++++- dlls/ddraw/tests/ddraw7.c | 343 +++++- dlls/ddraw/tests/dsurface.c | 28 - dlls/ddraw/vertexbuffer.c | 3 + dlls/gameux/tests/gameexplorer.c | 2 +- dlls/gdiplus/tests/brush.c | 4 +- dlls/glu32/geom.c | 8 +- dlls/glu32/mipmap.c | 2 +- dlls/inetcomm/tests/mimeole.c | 4 +- dlls/kernel32/tests/process.c | 8 +- dlls/kernel32/tests/thread.c | 1 + dlls/kernel32/tests/version.c | 2 +- dlls/mlang/tests/mlang.c | 6 +- dlls/mpr/tests/mpr.c | 4 +- dlls/mshtml/htmlevent.c | 4 +- dlls/mshtml/nsevents.c | 15 +- dlls/mshtml/tests/activex.c | 7 +- dlls/mshtml/tests/dom.c | 7 +- dlls/mshtml/tests/events.c | 4 +- dlls/mshtml/tests/events.html | 2 +- dlls/mshtml/tests/events.js | 2 +- dlls/mshtml/tests/xmlhttprequest.c | 2 +- dlls/msi/action.c | 25 +- dlls/msi/custom.c | 16 +- dlls/msi/dialog.c | 2 +- dlls/msi/install.c | 8 +- dlls/msi/msi.c | 6 +- dlls/msi/msipriv.h | 8 +- dlls/msi/package.c | 1 - dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr100/tests/msvcr100.c | 1 + dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 2 +- dlls/msvcrt/console.c | 8 +- dlls/msvcrt/cpp.c | 38 +- dlls/msvcrt/ctype.c | 2 + dlls/msvcrt/data.c | 4 + dlls/msvcrt/environ.c | 8 +- dlls/msvcrt/errno.c | 20 +- dlls/msvcrt/exit.c | 6 +- dlls/msvcrt/file.c | 37 +- dlls/msvcrt/heap.c | 20 +- dlls/msvcrt/locale.c | 28 +- dlls/msvcrt/scanf.c | 4 + dlls/msvcrt/string.c | 8 + dlls/msvcrt/tests/locale.c | 122 +- dlls/msvcrt/tests/time.c | 5 +- dlls/msvcrt/time.c | 18 +- dlls/msvcrt/wcs.c | 37 +- dlls/ntdll/signal_i386.c | 1 + dlls/ntdll/string.c | 24 +- dlls/ntdll/tests/atom.c | 1 + dlls/ole32/datacache.c | 4 +- dlls/oleaut32/tests/olepicture.c | 16 +- dlls/oledb32/convert.c | 8 +- dlls/oledb32/dslocator.c | 15 + dlls/oledb32/tests/convert.c | 31 + dlls/oledb32/tests/database.c | 12 + dlls/opengl32/version.rc | 2 +- dlls/psapi/tests/psapi_main.c | 4 +- dlls/sapi/token.c | 6 +- dlls/shell32/control.c | 10 +- dlls/shell32/iconcache.c | 2 +- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shlfileop.c | 2 +- dlls/shell32/tests/progman_dde.c | 20 +- dlls/shell32/tests/shelldispatch.c | 16 +- dlls/twain_32/dsm_ctrl.c | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/user32/combo.c | 10 +- dlls/user32/tests/combo.c | 2 +- dlls/user32/tests/dialog.c | 3 +- dlls/user32/tests/input.c | 1 + dlls/user32/tests/msg.c | 16 + dlls/user32/tests/win.c | 1 + dlls/vbscript/tests/run.c | 3 +- dlls/webservices/tests/channel.c | 4 + dlls/webservices/tests/proxy.c | 7 +- dlls/wineandroid.drv/AndroidManifest.xml | 1 + dlls/wined3d/resource.c | 22 +- dlls/wined3d/surface.c | 58 +- dlls/wined3d/texture.c | 10 +- dlls/wined3d/utils.c | 47 +- dlls/wined3d/wined3d_private.h | 8 +- dlls/winex11.drv/keyboard.c | 334 ++--- dlls/winhttp/tests/notification.c | 3 + dlls/winhttp/tests/winhttp.c | 6 +- dlls/wininet/tests/http.c | 3 + dlls/ws2_32/tests/sock.c | 223 +--- dlls/wsdapi/tests/address.c | 4 +- dlls/wsdapi/wsdapi.spec | 2 +- dlls/wtsapi32/wtsapi32.c | 2 +- include/wine/wine_common_ver.rc | 2 +- include/winnt.h | 2 +- po/ca.po | 10 +- po/pt_PT.po | 1154 +++++++----------- po/sv.po | 1274 ++++++++++---------- programs/reg/tests/reg.c | 24 +- programs/regedit/tests/regedit.c | 19 +- server/device.c | 2 +- 121 files changed, 3598 insertions(+), 2224 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git _______________________________________________ pkg-wine-party mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-wine-party
