diff options
| author | Joakim Verona | 2012-12-11 12:02:20 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-12-11 12:02:20 +0100 |
| commit | 5ccd4f20470d8e216ca3eae26339100a5eab52f1 (patch) | |
| tree | 70caca485fbaef0dcce16a811908c4b9b121ee1e /lib-src/ChangeLog | |
| parent | c0b95835acf65071ac1d740d15f7bcaa55c2a04b (diff) | |
| parent | c6afe371b0218154957bbef17c3f8bda5377b7c8 (diff) | |
| download | emacs-5ccd4f20470d8e216ca3eae26339100a5eab52f1.tar.gz emacs-5ccd4f20470d8e216ca3eae26339100a5eab52f1.zip | |
some conflict resolution
Diffstat (limited to 'lib-src/ChangeLog')
| -rw-r--r-- | lib-src/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 480ddabd44a..866e76ad24f 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2012-12-11 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * makefile.w32-in (SYSWAIT_H): Update dependencies. | ||
| 4 | |||
| 5 | 2012-12-10 Eli Zaretskii <eliz@gnu.org> | ||
| 6 | |||
| 7 | * makefile.w32-in (obj): Add w32notify.o. Add missing X and Unix | ||
| 8 | sources. | ||
| 9 | |||
| 1 | 2012-12-02 Kevin Ryde <user42@zip.com.au> | 10 | 2012-12-02 Kevin Ryde <user42@zip.com.au> |
| 2 | 11 | ||
| 3 | * etags.c (Lisp_functions): Skip (defvar foo) declarations unless | 12 | * etags.c (Lisp_functions): Skip (defvar foo) declarations unless |