]> git.eshelyaron.com Git - emacs.git/commit
; Fix errors introduced during merge.
authorNickolas Lloyd <ultrageek.lloyd@gmail.com>
Thu, 2 Feb 2017 02:07:03 +0000 (21:07 -0500)
committerNickolas Lloyd <ultrageek.lloyd@gmail.com>
Thu, 2 Feb 2017 02:10:32 +0000 (21:10 -0500)
commit5d8f2548ceaa5a0b33c08a39f1d6c11071ec63aa
treecb634d796ce62dbba8c3e9295749d8e6f9e9c345
parent3dcb25deaefb52c9d314c4eddb93a3a815a58ec0
; Fix errors introduced during merge.
src/bytecode-jit.c
src/bytecode.c
src/lisp.h