diff options
| author | Miles Bader | 2007-08-03 05:20:51 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-08-03 05:20:51 +0000 |
| commit | e145a7fe95fb8f97407d125f94653ef95e42696d (patch) | |
| tree | 4f83705aac9d1a4416dabcf774115f7cccb80bda /lib-src | |
| parent | 2a4924ce174b1a2b032558f3036f1d95445c4936 (diff) | |
| parent | 2f12b713116a4e15b4744fc78d5f0dbb57fcd1ca (diff) | |
| download | emacs-e145a7fe95fb8f97407d125f94653ef95e42696d.tar.gz emacs-e145a7fe95fb8f97407d125f94653ef95e42696d.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 832-838)
- Remove lisp/erc/erc-nicklist.el
- Update some .arch-inventory files
- Fix void function definition error in cus-edit.el
- Update from CVS
- Restore lisp/emacs-lisp/cl-loaddefs.el
- Merge from emacs--rel--22
* emacs--rel--22 (patch 75-83)
- Update from CVS
- Remove lisp/erc/erc-nicklist.el
- Update some .arch-inventory files
- Indicate that emacs--devo--0--patch-834 does not need to be applied
- Merge from gnus--rel--5.10
- Restore lisp/emacs-lisp/cl-loaddefs.el
* gnus--rel--5.10 (patch 239-241)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-239
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/.arch-inventory | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib-src/.arch-inventory b/lib-src/.arch-inventory index 362f3aebf63..1b0b3aec45a 100644 --- a/lib-src/.arch-inventory +++ b/lib-src/.arch-inventory | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | # Ignore binaries | 1 | # Ignore binaries |
| 2 | backup ^(test-distrib|make-docfile|profile|digest-doc|movemail|cvtmail|fakemail|yow|emacsserver|hexl|update-game-score|etags|ctags|emacsclient|b2m|ebrowse|sorted-doc)$ | 2 | backup ^(test-distrib|make-docfile|profile|digest-doc|movemail|cvtmail|fakemail|blessmail|yow|emacsserver|hexl|update-game-score|etags|ctags|emacsclient|b2m|ebrowse|sorted-doc)$ |
| 3 | 3 | ||
| 4 | # Building actually makes a copy/link of the source file | 4 | # Building actually makes a copy/link of the source file |
| 5 | precious ^(ctags\.c)$ | 5 | precious ^(ctags\.c)$ |