about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2014-07-26 14:58:49 -0700
committerBarton E. Schaefer <schaefer@zsh.org>2014-07-26 14:58:49 -0700
commit0f20ffdd1562b438ad822136fbaee23cebc9f1c3 (patch)
tree5b23df76acc4b90316578bf20715b1bcb1c35e8c /ChangeLog
parente439bd105b9a15e18c57dc0208205c467a67e685 (diff)
parent05ce4f2a0b7a4ecbf5f893efcfd94fb627a71861 (diff)
downloadzsh-0f20ffdd1562b438ad822136fbaee23cebc9f1c3.tar.gz
zsh-0f20ffdd1562b438ad822136fbaee23cebc9f1c3.tar.xz
zsh-0f20ffdd1562b438ad822136fbaee23cebc9f1c3.zip
Merge branch 'master' of git://git.code.sf.net/p/zsh/code
Conflicts:
	ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a2833a13..481bbc3f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-07-26  Axel Beckert  <abe@deuxchevaux.org>
+
+	* Omari Norman: 32817: Add completion for moosic.
+
+	* Sebastian Ramacher: 32816: Add completion for bpython and
+	variants.
+
+	* 32911: Expand bpython completion to bpython2 and bpython3.
+
 2014-07-26  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* 32910: Src/mkmakemod.sh: quiet update of timestamp files