summaryrefslogtreecommitdiff
path: root/lisp/term
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2014-11-28 22:55:31 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2014-11-28 23:07:16 -0800
commit0cce3623b169732a51f055a86fc926313b11a5ee (patch)
tree17154977d6e77f604ede0b82f89b2aeb6925310a /lisp/term
parent9875d23d86c0668b1e697b67a394560d66c7826d (diff)
parent6b765b8facbdbb03f28028007885236601652515 (diff)
Merge branch 'emacs-24'.
Diffstat (limited to 'lisp/term')
-rw-r--r--lisp/term/.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/term/.gitignore b/lisp/term/.gitignore
deleted file mode 100644
index c531d9867f..0000000000
--- a/lisp/term/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.elc