diff options
| author | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-11-05 00:09:56 +0000 |
|---|---|---|
| committer | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-11-05 00:09:56 +0000 |
| commit | 542b84358933e363773afe2105c9fa5ee494e18b (patch) | |
| tree | e0d47552102f9345daf0ebe6a03ae6487a78c0c3 /aclocal.m4 | |
| parent | 372555ff201bad639c4b50411293cfd872e31728 (diff) | |
| download | zsh-542b84358933e363773afe2105c9fa5ee494e18b.tar.gz zsh-542b84358933e363773afe2105c9fa5ee494e18b.tar.xz zsh-542b84358933e363773afe2105c9fa5ee494e18b.zip | |
Reverse the merging of 21296 onto 4.2 branch; the builtin.c piece had a merge conflict, and my resolution of it caused test failure in C03.
Diffstat (limited to 'aclocal.m4')
0 files changed, 0 insertions, 0 deletions