aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2011-02-21 15:46:32 -0800
committerPaul Eggert2011-02-21 15:46:32 -0800
commit9441f0e4fca691e4d2a2c7842373de8f29414b17 (patch)
tree6db82cf30a48bd72485db5c4cc2f19d4a142f727 /ChangeLog
parentba01e9d785457898d873d6c8ec8bc1965fe4ff28 (diff)
parente84efb7078b7251b8c8bf15f71fed653cfa535a5 (diff)
downloademacs-9441f0e4fca691e4d2a2c7842373de8f29414b17.tar.gz
emacs-9441f0e4fca691e4d2a2c7842373de8f29414b17.zip
Merge from mainline.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ef876b6e831..cfd77b652b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,17 @@
2 2
3 * lib/min-max.h: New file, for "min" and "max". 3 * lib/min-max.h: New file, for "min" and "max".
4 4
52011-02-21 Christoph Scholtes <cschol2112@gmail.com>
6
7 * lib/makefile.w32-in: ($(BLD)/md5.$(O)): Added dependency on
8 $(EMACS_ROOT)/nt/inc/stdint.h.
9
102011-02-21 Eli Zaretskii <eliz@gnu.org>
11
12 * lib/makefile.w32-in ($(BLD)/filemode.$(O)): Move from
13 src/makefile.w32-in and adapt. Depend on stamp_BLD.
14 (GNULIBOBJS): Add $(BLD)/filemode.$(O).
15
52011-02-20 Paul Eggert <eggert@cs.ucla.edu> 162011-02-20 Paul Eggert <eggert@cs.ucla.edu>
6 17
7 Import filemode module from gnulib. 18 Import filemode module from gnulib.