diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2015-10-24 13:57:03 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2015-10-24 13:57:03 -0700 |
| commit | 2685bbc4ae51516738c85da7ff1300262785f9b0 (patch) | |
| tree | eb97e3f5b232b863d7d10ef883dae7f37aa0ba8d /ChangeLog | |
| parent | 506d5923802a930f24dd264588a8d33c05ed085b (diff) | |
| parent | e3c68450d77e679499a93fa87d964907213e15c3 (diff) | |
| download | zsh-2685bbc4ae51516738c85da7ff1300262785f9b0.tar.gz zsh-2685bbc4ae51516738c85da7ff1300262785f9b0.tar.xz zsh-2685bbc4ae51516738c85da7ff1300262785f9b0.zip | |
Merge branch 'master' of git://git.code.sf.net/p/zsh/code
Conflicts: ChangeLog Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 31fc78366..e6edaa8c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,17 @@ * 36943 (with updated comment): Src/mem.c: restore scan for reclaimable blocks in freeheap() [had been removed by 36834] +2015-10-24 Daniel Shahaf <d.s@daniel.shahaf.name> + + * unposted: Completion/Unix/Command/_beep: _beep completion: + Actually hook it for the 'beep' command. + + * 36913 + 36945: Functions/VCS_Info/VCS_INFO_quilt: vcs_info quilt: + Pass patch subject lines to gen-applied-string + + * 36912: Functions/VCS_Info/VCS_INFO_quilt: vcs_info quilt: + Tolerate being in child of .pc's parent + 2015-10-24 Peter Stephenson <p.w.stephenson@ntlworld.com> * unposted: Src/utils.c: small typo. |