aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to 'admin')
-rw-r--r--admin/CPP-DEFINES1
-rw-r--r--admin/ChangeLog4
2 files changed, 4 insertions, 1 deletions
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index c5f8c7ab31f..8310d0d96cc 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -120,7 +120,6 @@ HAVE_FMOD
120HAVE_FPATHCONF 120HAVE_FPATHCONF
121HAVE_FREXP 121HAVE_FREXP
122HAVE_FSYNC 122HAVE_FSYNC
123HAVE_FTIME
124HAVE_GETCWD 123HAVE_GETCWD
125HAVE_GETDOMAINNAME 124HAVE_GETDOMAINNAME
126HAVE_GETHOSTNAME 125HAVE_GETHOSTNAME
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 01f10f4aea5..deb83a96b50 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
12012-05-19 Paul Eggert <eggert@cs.ucla.edu>
2
3 * CPP-DEFINES (HAVE_FTIME): Remove.
4
12012-05-02 Glenn Morris <rgm@gnu.org> 52012-05-02 Glenn Morris <rgm@gnu.org>
2 6
3 * bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit". 7 * bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".