summaryrefslogtreecommitdiff
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
authorFabián Ezequiel Gallina <galli.87@gmail.com>2014-11-14 02:29:40 -0300
committerFabián Ezequiel Gallina <galli.87@gmail.com>2014-11-14 02:29:40 -0300
commit5d977b968c5d55470daa337df52ca2689d434e3c (patch)
tree19a7d34773a1c9b35095425769f139f389e5c1f5 /lisp/ChangeLog
parentf48827adbaa65fe1ef778beb7814d557ced12017 (diff)
downloademacs-5d977b968c5d55470daa337df52ca2689d434e3c.tar.gz
* lisp/progmodes/python.el (python-shell-completion-get-completions):
Fix previous merge.
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7bec543fd4d..9c673c861d9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-14 Fabián Ezequiel Gallina <fgallina@gnu.org>
+
+ * progmodes/python.el (python-shell-completion-get-completions):
+ Fix previous merge.
+
2014-11-14 Lars Magne Ingebrigtsen <larsi@gnus.org>
* net/eww.el (eww-render): Don't set the title to the URL.