Mercurial > emacs
annotate .bzrignore @ 108104:17710e3a17df
Remove conflict markers.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sat, 24 Apr 2010 14:33:31 +0200 |
parents | c168d4537385 |
children | 728449765ab0 |
rev | line source |
---|---|
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
1 ./bin |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
2 ./BIN |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
3 ./data |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
4 ./etc/icons |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
5 ./lock |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
6 ./site-lisp |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
7 ./_dir-locals.el |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
8 ./config.log |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
9 ./config.status |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
10 oo |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
11 oo-spd |
106654 | 12 autom4te.cache |
107941
171da9949036
Add nextstep/Emacs.app, *.dSYM (OS X compilation artifacts) to .bzrignore.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
107066
diff
changeset
|
13 *.dSYM |
106654 | 14 *.elc |
106809
5cb0f4fd512e
* .bzrignore: Ignore all .exe, instead of individual files.
Juanma Barranquero <lekktu@gmail.com>
parents:
106705
diff
changeset
|
15 *.exe |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
16 DOC |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
17 DOC-* |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
18 makefile |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
19 Makefile |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
20 Makefile.c |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
21 stamp_BLD |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
22 subdirs.el |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
23 TAGS |
107066
3b5ef09ea743
* .bzrignore: Add TAGS-LISP.
Juri Linkov <juri@jurta.org>
parents:
106972
diff
changeset
|
24 TAGS-LISP |
106654 | 25 info/* |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
26 leim/leim-list.el |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
27 leim/quail/*.el |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
28 leim/changed.misc |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
29 leim/changed.tit |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
30 lib-src/ctags.c |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
31 lib-src/echolisp.tmp |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
32 lib-src/getopt.h |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
33 lib-src/b2m |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
34 lib-src/ctags |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
35 lib-src/digest-doc |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
36 lib-src/ebrowse |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
37 lib-src/emacsclient |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
38 lib-src/etags |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
39 lib-src/fakemail |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
40 lib-src/hexl |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
41 lib-src/make-docfile |
106705
a7854ddcdd85
.bzrignore: Add 2 more patterns.
Eli Zaretskii <eliz@gnu.org>
parents:
106704
diff
changeset
|
42 lib-src/movemail |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
43 lib-src/profile |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
44 lib-src/sorted-doc |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
45 lib-src/test-distrib |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
46 lib-src/update-game-score |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
47 lisp/**/*-loaddefs.el |
106654 | 48 lisp/**/loaddefs.el |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
49 lisp/cus-load.el |
106654 | 50 lisp/eshell/esh-groups.el |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
51 lisp/finder-inf.el |
107941
171da9949036
Add nextstep/Emacs.app, *.dSYM (OS X compilation artifacts) to .bzrignore.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
107066
diff
changeset
|
52 nextstep/Emacs.app |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
53 nt/config.log |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
54 src/buildobj.h |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
55 src/config.h |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
56 src/epaths.h |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
57 src/_dbxinit |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
58 src/_gdbinit |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
59 src/gdb.ini |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
60 src/bootstrap-emacs |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
61 src/emacs |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
62 src/emacs-* |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
63 src/prefix-args* |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
64 src/stamp-oldxmenu |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
65 src/temacs |
106705
a7854ddcdd85
.bzrignore: Add 2 more patterns.
Eli Zaretskii <eliz@gnu.org>
parents:
106704
diff
changeset
|
66 src/deps |
106972
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106809
diff
changeset
|
67 configure.lineno |
107539
693207d4182a
Ignore tempfiles of the configure script
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107066
diff
changeset
|
68 conftest* |
693207d4182a
Ignore tempfiles of the configure script
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107066
diff
changeset
|
69 confdefs.h |
107808
0a321c28c1b4
Fix some of the problems in defsubst* (bug#5728).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107539
diff
changeset
|
70 core |