aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--ChangeLog4
2 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a9104e9ed5..6d48164a4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,6 +109,7 @@ y.tab.c
# /enc/trans/
/enc/trans/*.c
+/enc/trans/.time
# /ext/
/ext/extinit.c
diff --git a/ChangeLog b/ChangeLog
index a86de3f7b1..06974e4eb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jan 26 22:09:35 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * .gitignore: ignored temporary file with git.
+
Mon Jan 26 18:06:03 2015 Akinori MUSHA <knu@iDaemons.org>
* misc/ruby-electric.el: Import version 2.2.2 from