comparison .bzrignore @ 110468:8ceac426a2d7

merge trunk
author Kenichi Handa <handa@m17n.org>
date Tue, 21 Sep 2010 20:45:10 +0900
parents 9718a33c16dc
children 239dd45a7dac
comparison
equal deleted inserted replaced
110384:8d0ea2f29215 110468:8ceac426a2d7
54 lisp/**/*-loaddefs.el 54 lisp/**/*-loaddefs.el
55 lisp/**/loaddefs.el 55 lisp/**/loaddefs.el
56 lisp/cus-load.el 56 lisp/cus-load.el
57 lisp/eshell/esh-groups.el 57 lisp/eshell/esh-groups.el
58 lisp/finder-inf.el 58 lisp/finder-inf.el
59 lisp/gnus/_dir-locals.el
59 nextstep/Emacs.app 60 nextstep/Emacs.app
60 nt/config.log 61 nt/config.log
61 src/_dbxinit 62 src/_dbxinit
62 src/_gdbinit 63 src/_gdbinit
63 src/bootstrap-emacs 64 src/bootstrap-emacs