1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f339482a98..f4426fa36da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * .dir-locals.el (indent-tabs-mode): Remove personal preference.
 2012-08-21  Paul Eggert  <eggert@cs.ucla.edu>
        Merge from gnulib, incorporating:

diff --git a/ChangeLog b/ChangeLog index 4f339482a98..f4426fa36da 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -1,3 +1,7 @@
		1	2012-09-24 Stefan Monnier <monnier@iro.umontreal.ca>
		2
		3	* .dir-locals.el (indent-tabs-mode): Remove personal preference.
		4
1	2012-08-21 Paul Eggert <eggert@cs.ucla.edu>	5	2012-08-21 Paul Eggert <eggert@cs.ucla.edu>
2		6
3	Merge from gnulib, incorporating:	7	Merge from gnulib, incorporating: