diff options
| author | marha <marha@users.sourceforge.net> | 2015-03-22 14:10:47 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-03-22 14:10:47 +0100 |
| commit | 3bc24b271f45f9f33484b8cf53b44f33f7e8a237 (patch) | |
| tree | 193651a94adb3804e800747e993d07b92688e4d4 /xkbcomp | |
| parent | c646056120fe14e4c4ccf81bac5d78d61225a8e8 (diff) | |
| parent | 82c8df11062f72a7d467e26cedbbd8b322ff7a70 (diff) | |
| download | vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.gz vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.bz2 vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mapi/glapi/glapi_nop.c
mesalib/src/mesa/main/bufferobj.c
Diffstat (limited to 'xkbcomp')
| -rw-r--r-- | xkbcomp/parseutils.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/xkbcomp/parseutils.c b/xkbcomp/parseutils.c index ab50c5710..e98adf123 100644 --- a/xkbcomp/parseutils.c +++ b/xkbcomp/parseutils.c @@ -29,7 +29,6 @@ #include "xkbpath.h" #include <X11/keysym.h> #include <X11/extensions/XKBgeom.h> -#include <X11/Xalloca.h> #include <limits.h> #include <stdlib.h> |