Merge src/alloc.c and src/malloc.c
authorRan Benita <ran234@gmail.com>
Tue, 10 Apr 2012 23:02:45 +0000 (02:02 +0300)
committerDaniel Stone <daniel@fooishbar.org>
Tue, 1 May 2012 12:59:23 +0000 (13:59 +0100)
commit409ec8a12ef54f3eea704a8234e4cd26928bf87e
tree91df4073a0819adc62fb10896a85cceeddf55f2d
parentaff531fb4db5bb5ae266b55e1f81abb939e4d059
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.]
Makefile.am
src/alloc.c
src/malloc.c [deleted file]
src/xkballoc.h