summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRan Benita <ran234@gmail.com>2012-04-11 02:02:45 +0300
committerDaniel Stone <daniel@fooishbar.org>2012-05-01 13:59:23 +0100
commit409ec8a12ef54f3eea704a8234e4cd26928bf87e (patch)
tree91df4073a0819adc62fb10896a85cceeddf55f2d /include
parentaff531fb4db5bb5ae266b55e1f81abb939e4d059 (diff)
downloadxorg-lib-libxkbcommon-409ec8a12ef54f3eea704a8234e4cd26928bf87e.tar.gz
Merge src/alloc.c and src/malloc.c
The two files do exactly the same sort of things, without any discernible reason for splitting them. Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Updated for xkb_desc -> xkb_keymap changes.]
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions