summary refs log tree commit diff
path: root/Doc
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2014-07-23 08:50:09 -0700
committerBarton E. Schaefer <schaefer@zsh.org>2014-07-23 08:50:09 -0700
commitf33270e8797c258caec81dfd94dfaff99acda29b (patch)
treeb8adc205436317bb8e2685965c9dd85af6cb179b /Doc
parent52d4cd2e91408dec22f46c3c1a8f05d252560437 (diff)
parent35176b435f8cb12b09876bd3add56d95ba80ccd8 (diff)
downloadzsh-f33270e8797c258caec81dfd94dfaff99acda29b.tar.gz
zsh-f33270e8797c258caec81dfd94dfaff99acda29b.tar.xz
zsh-f33270e8797c258caec81dfd94dfaff99acda29b.zip
Merge branch 'master' of git://git.code.sf.net/p/zsh/code
Conflicts:
	ChangeLog
Diffstat (limited to 'Doc')
0 files changed, 0 insertions, 0 deletions