diff options
| author | Paul Eggert | 2012-04-17 15:57:44 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-04-17 15:57:44 -0700 |
| commit | 6083b85e047ca60a3132b62bbb4def3bc0b6e4d9 (patch) | |
| tree | df152856da9938f75fdc8ad1adfd98532c95f7dc /src/ChangeLog | |
| parent | 67546201c09718dee616cda362fef96f6f31996d (diff) | |
| parent | aba027e80c6d2776d7ec35747308367351871e98 (diff) | |
| download | emacs-6083b85e047ca60a3132b62bbb4def3bc0b6e4d9.tar.gz emacs-6083b85e047ca60a3132b62bbb4def3bc0b6e4d9.zip | |
Merge from trunk.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 78fa3b501a3..ae245a254a0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -11,6 +11,10 @@ | |||
| 11 | the Emacs and Gnulib regex code is merged. | 11 | the Emacs and Gnulib regex code is merged. |
| 12 | (xmalloc, xrealloc): Now static. | 12 | (xmalloc, xrealloc): Now static. |
| 13 | 13 | ||
| 14 | 2012-04-17 Paul Eggert <eggert@cs.ucla.edu> | ||
| 15 | |||
| 16 | * dired.c (Fsystem_groups): Remove unused local. | ||
| 17 | |||
| 14 | 2012-04-17 Glenn Morris <rgm@gnu.org> | 18 | 2012-04-17 Glenn Morris <rgm@gnu.org> |
| 15 | 19 | ||
| 16 | * dired.c (Fsystem_users): Doc fix. | 20 | * dired.c (Fsystem_users): Doc fix. |