Mercurial > emacs
comparison .bzrignore @ 109853:fe07c47cf7a7
merge and fixes
author | Joakim <joakim@localhost.localdomain> |
---|---|
date | Thu, 13 May 2010 15:13:52 +0200 |
parents | c168d4537385 |
children | 728449765ab0 |
comparison
equal
deleted
inserted
replaced
109852:e56f669f17ce | 109853:fe07c47cf7a7 |
---|---|
8 ./config.log | 8 ./config.log |
9 ./config.status | 9 ./config.status |
10 oo | 10 oo |
11 oo-spd | 11 oo-spd |
12 autom4te.cache | 12 autom4te.cache |
13 *.dSYM | |
13 *.elc | 14 *.elc |
14 *.exe | 15 *.exe |
15 DOC | 16 DOC |
16 DOC-* | 17 DOC-* |
17 makefile | 18 makefile |
46 lisp/**/*-loaddefs.el | 47 lisp/**/*-loaddefs.el |
47 lisp/**/loaddefs.el | 48 lisp/**/loaddefs.el |
48 lisp/cus-load.el | 49 lisp/cus-load.el |
49 lisp/eshell/esh-groups.el | 50 lisp/eshell/esh-groups.el |
50 lisp/finder-inf.el | 51 lisp/finder-inf.el |
52 nextstep/Emacs.app | |
51 nt/config.log | 53 nt/config.log |
52 src/buildobj.h | 54 src/buildobj.h |
53 src/config.h | 55 src/config.h |
54 src/epaths.h | 56 src/epaths.h |
55 src/_dbxinit | 57 src/_dbxinit |