diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-18 10:12:07 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-18 10:12:07 +0200 |
| commit | 980040093547dc8dd563d8cb9d003aa39737eda4 (patch) | |
| tree | c85afeb4affd10ee0d6001d18569510ef6488272 /xorg-server/hw/xwin/winerror.c | |
| parent | 01102cdf33d68a7be192a139752831ff93dee117 (diff) | |
| parent | 2ff5448bcca8cba4b62026d5493cb08aaf2838d8 (diff) | |
| download | vcxsrv-980040093547dc8dd563d8cb9d003aa39737eda4.tar.gz vcxsrv-980040093547dc8dd563d8cb9d003aa39737eda4.tar.bz2 vcxsrv-980040093547dc8dd563d8cb9d003aa39737eda4.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/.gitignore
xorg-server/Xext/panoramiX.c
xorg-server/hw/xwin/win.h
xorg-server/hw/xwin/winclipboardinit.c
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/winclipboardunicode.c
xorg-server/hw/xwin/winclipboardwrappers.c
xorg-server/hw/xwin/winclipboardxevents.c
xorg-server/hw/xwin/wincreatewnd.c
xorg-server/hw/xwin/windialogs.c
xorg-server/hw/xwin/winerror.c
xorg-server/hw/xwin/winmonitors.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winprocarg.c
xorg-server/hw/xwin/winwndproc.c
Diffstat (limited to 'xorg-server/hw/xwin/winerror.c')
| -rw-r--r-- | xorg-server/hw/xwin/winerror.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/xwin/winerror.c b/xorg-server/hw/xwin/winerror.c index 9838fa085..d5f497fda 100644 --- a/xorg-server/hw/xwin/winerror.c +++ b/xorg-server/hw/xwin/winerror.c @@ -142,7 +142,7 @@ winMessageBoxF(const char *pszError, UINT uType, ...) size = asprintf(&pszMsgBox, MESSAGEBOXF, pszErrorF, XVENDORNAME, XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, - XORG_VERSION_SNAP, + XORG_VERSION_SNAP, BUILDERADDR, BUILDERSTRING, g_pszCommandLine); if (size == -1) { |