diff options
| author | Joakim Verona | 2012-05-21 00:37:29 +0200 |
|---|---|---|
| committer | Joakim Verona | 2012-05-21 00:37:29 +0200 |
| commit | 74f082445c1dd0c92d5bb187db0d50287e3a7bae (patch) | |
| tree | 48e3d8fd9df3876665654eab9bcf96ec492a31e9 /admin/ChangeLog | |
| parent | 52862ad482e030e4d54cd7d6e250d76e59ee0554 (diff) | |
| parent | 1b170bc63c2f3a3fbe6ba6996d5a015e82634909 (diff) | |
| download | emacs-74f082445c1dd0c92d5bb187db0d50287e3a7bae.tar.gz emacs-74f082445c1dd0c92d5bb187db0d50287e3a7bae.zip | |
upstream, fix conflicts
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index a3a756bde64..55504b3d6f8 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2012-05-19 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * CPP-DEFINES (HAVE_GETDOMAINNAME): Remove. | ||
| 4 | |||
| 5 | * CPP-DEFINES (HAVE_FTIME): Remove. | ||
| 6 | |||
| 7 | 2012-05-02 Glenn Morris <rgm@gnu.org> | ||
| 8 | |||
| 9 | * bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit". | ||
| 10 | |||
| 1 | 2012-04-10 Glenn Morris <rgm@gnu.org> | 11 | 2012-04-10 Glenn Morris <rgm@gnu.org> |
| 2 | 12 | ||
| 3 | * bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk". | 13 | * bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk". |
| @@ -1262,7 +1272,7 @@ | |||
| 1262 | ;; coding: utf-8 | 1272 | ;; coding: utf-8 |
| 1263 | ;; End: | 1273 | ;; End: |
| 1264 | 1274 | ||
| 1265 | Copyright (C) 2001-2012 Free Software Foundation, Inc. | 1275 | Copyright (C) 2001-2012 Free Software Foundation, Inc. |
| 1266 | 1276 | ||
| 1267 | This file is part of GNU Emacs. | 1277 | This file is part of GNU Emacs. |
| 1268 | 1278 | ||