* fileio.c, fns.c (merge): Move extern decl from here ...
commit6318cde023c4ffff777dde20768046e057d85448
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Aug 2013 22:24:02 +0000 (1 23:24 +0100)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Aug 2013 22:24:02 +0000 (1 23:24 +0100)
tree182f5f5fe9d02f41a31804e543d2a2944400ca8d
parent5f648ab4b0a3f55c0e85253fb0d6a6f8b8326c12
* fileio.c, fns.c (merge): Move extern decl from here ...

* lisp.h (merge): ... to here.
src/ChangeLog
src/fileio.c
src/fns.c
src/lisp.h