aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-03-31 11:17:25 +0000
committerJuanma Barranquero2008-03-31 11:17:25 +0000
commit2bd4bdc463db6b0b9e5bca0370f56db49f6c0968 (patch)
treee10bedb2fda39f2988355c7776ae0698386bf729
parentdaedb1963502ac930b3c52ea5b346fbd89967b0d (diff)
downloademacs-2bd4bdc463db6b0b9e5bca0370f56db49f6c0968.tar.gz
emacs-2bd4bdc463db6b0b9e5bca0370f56db49f6c0968.zip
*** empty log message ***
-rw-r--r--lisp/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e17d8f3fa26..fedb3348245 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-03-31 Juanma Barranquero <lekktu@gmail.com>
2
3 * emacs-lisp/bytecomp.el (byte-compile-warnings-safe-p):
4 Use `byte-compile-warning-types'. Add docstring.
5
12008-03-31 Stefan Monnier <monnier@iro.umontreal.ca> 62008-03-31 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * smerge-mode.el (smerge-apply-resolution-patch): New fun. 8 * smerge-mode.el (smerge-apply-resolution-patch): New fun.