summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-01-30 15:34:18 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-01-30 15:34:18 -0800
commit16c3e636a68cf74386d3d4d582a3a189b84d700c (patch)
tree43ef51bef626bf3b4c4d578e8dce0ad9857e98df /admin
parent4eec7f8b2b465c6fc2c09d37d4da2b540f607df0 (diff)
downloademacs-16c3e636a68cf74386d3d4d582a3a189b84d700c.tar.gz
strftime: import from gnulib
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog5
-rw-r--r--admin/notes/copyright1
2 files changed, 5 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 5ce38fdfbd5..04fcf732bd9 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-30 Paul Eggert <eggert@cs.ucla.edu>
+
+ strftime: import from gnulib
+ * notes/copyright: strftime.c moved from src to lib.
+
2011-01-25 Glenn Morris <rgm@gnu.org>
* bzrmerge.el (bzrmerge-skip-regexp): New variable.
diff --git a/admin/notes/copyright b/admin/notes/copyright
index df48d098f19..e4077caf77b 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -635,7 +635,6 @@ alone (may import them from Gnulib again). These are:
src/gmalloc.c
src/md5.c
src/md5.h
- src/strftime.c
src/termcap.c
src/tparam.c