diff options
author | Barton E. Schaefer <schaefer@zsh.org> | 2014-07-26 14:58:49 -0700 |
---|---|---|
committer | Barton E. Schaefer <schaefer@zsh.org> | 2014-07-26 14:58:49 -0700 |
commit | 0f20ffdd1562b438ad822136fbaee23cebc9f1c3 (patch) | |
tree | 5b23df76acc4b90316578bf20715b1bcb1c35e8c /.preconfig | |
parent | e439bd105b9a15e18c57dc0208205c467a67e685 (diff) | |
parent | 05ce4f2a0b7a4ecbf5f893efcfd94fb627a71861 (diff) | |
download | zsh-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 '.preconfig')
0 files changed, 0 insertions, 0 deletions