diff options
| author | Joakim Verona | 2011-07-15 04:39:29 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-07-15 04:39:29 +0200 |
| commit | 4f616a2e7ed1db28da98df90266e9751a8ae9ee1 (patch) | |
| tree | 74a9dcbe13e945e712ae04a4a94c2202ca720591 /src/ChangeLog.6 | |
| parent | ff2be00005c3aeda6e11d7ed264ce86f02b60958 (diff) | |
| parent | ec2bc542a4d0127425625e8cb458684bd825675a (diff) | |
| download | emacs-4f616a2e7ed1db28da98df90266e9751a8ae9ee1.tar.gz emacs-4f616a2e7ed1db28da98df90266e9751a8ae9ee1.zip | |
merge from upstream
Diffstat (limited to 'src/ChangeLog.6')
| -rw-r--r-- | src/ChangeLog.6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6 index d7903568102..f9372aa666a 100644 --- a/src/ChangeLog.6 +++ b/src/ChangeLog.6 | |||
| @@ -4599,7 +4599,7 @@ | |||
| 4599 | 4599 | ||
| 4600 | 1995-08-14 Erik Naggum <erik@naggum.no> | 4600 | 1995-08-14 Erik Naggum <erik@naggum.no> |
| 4601 | 4601 | ||
| 4602 | * emacs.c (standard_args): Add option --eval to evalute an | 4602 | * emacs.c (standard_args): Add option --eval to evaluate an |
| 4603 | expression on the command line and print the result. | 4603 | expression on the command line and print the result. |
| 4604 | 4604 | ||
| 4605 | 1995-08-14 Richard Stallman <rms@mole.gnu.ai.mit.edu> | 4605 | 1995-08-14 Richard Stallman <rms@mole.gnu.ai.mit.edu> |