Commit 409ec8a12ef54f3eea704a8234e4cd26928bf87e
2012-04-11T02:02:45
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.]