diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-01 20:12:35 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-01 20:12:35 +0200 |
| commit | 19b4b68b35a047a83bd291ee8debac1adb0e946c (patch) | |
| tree | d4d4520622ecf73fa0d076dc0bf517a1189b7d9f /gl/glxproto.h | |
| parent | 4e080e0165d18887e2a0fccd7f30cf20fd04b178 (diff) | |
| parent | 438af0c7d4bf60b408b259c88205ff2193195466 (diff) | |
| download | vcxsrv-19b4b68b35a047a83bd291ee8debac1adb0e946c.tar.gz vcxsrv-19b4b68b35a047a83bd291ee8debac1adb0e946c.tar.bz2 vcxsrv-19b4b68b35a047a83bd291ee8debac1adb0e946c.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/macros.h
xorg-server/dix/registry.c
xorg-server/hw/kdrive/ephyr/ephyrinit.c
xorg-server/hw/xwin/Makefile.am
xorg-server/hw/xwin/glx/.gitignore
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/glx/indirect.c
xorg-server/hw/xwin/glx/winpriv.c
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/windisplay.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winprefs.c
Diffstat (limited to 'gl/glxproto.h')
| -rw-r--r-- | gl/glxproto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gl/glxproto.h b/gl/glxproto.h index b50adc2c8..b4629c78c 100644 --- a/gl/glxproto.h +++ b/gl/glxproto.h @@ -2157,7 +2157,7 @@ typedef struct { #define X_GLXCreateWindow 31 #define X_GLXDestroyWindow 32 #define X_GLXSetClientInfoARB 33 -#define X_GLXCreateContextAtrribsARB 34 +#define X_GLXCreateContextAttribsARB 34 #define X_GLXSetConfigInfo2ARB 35 /* Opcodes for single commands (part of GLX command space) */ |