diff options
| author | Hugues Hiegel <hugues@hiegel.fr> | 2008-05-24 12:02:06 +0200 |
|---|---|---|
| committer | Hugues Hiegel <hugues@hiegel.fr> | 2008-05-24 12:02:06 +0200 |
| commit | 6d127fd3274dcd551e175a9c0440f80aebcb2fc2 (patch) | |
| tree | 407e5d13acc9c5977a204c621625f48a5a6dc384 /host:delphine | |
| parent | e2f9a952558aea3a37296f45dc911f109342748a (diff) | |
| parent | bb76357c72d67b5eab803fccce27617d178f7ed3 (diff) | |
Merge branch 'master' of ssh://ssh.hiegel.fr/work/repos/zdotdir
Conflicts:
host:prunelle/Aliases.zsh
host:prunelle/Environment.zsh
host:prunelle/README
net:ordener.fr
net:ordener.fr/host:prunelle/Aliases.zsh
net:ordener.fr/host:prunelle/Environment.zsh
net:ordener.fr/host:prunelle/README
net:sweethome/host:prunelle/Aliases.zsh
net:sweethome/host:prunelle/Environment.zsh
net:sweethome/host:prunelle/README
user:hugues/KeyBindings.zsh
Diffstat (limited to 'host:delphine')
0 files changed, 0 insertions, 0 deletions