diff options
| author | Hugues Hiegel <hugues@hiegel.fr> | 2009-02-20 15:29:18 +0100 |
|---|---|---|
| committer | Hugues Hiegel <hugues@hiegel.fr> | 2009-02-20 15:29:18 +0100 |
| commit | 545fa99fe715ae62b49bb75492cdae187ac7d2f4 (patch) | |
| tree | fdc217dcb161ec50fd876ebc04ab104d8f5fb80f /net:osn.sagem | |
| parent | d2d3735f131c9d8cd9611e3a44d4da191e8d6293 (diff) | |
| parent | b8b74c4386808e9ee0ad37441569544fc93a11a0 (diff) | |
Merge branch 'master' of /work/repos/zdotdir
Conflicts:
net:osn.sagem/host:osnp1260077/user:g178241
Diffstat (limited to 'net:osn.sagem')
| l--------- | net:osn.sagem/host:osnp1260077/user:g178241 | 1 | ||||
| -rw-r--r-- | net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh (renamed from net:osn.sagem/host:osnp1260077/user:g178241/Environment.zsh) | 0 | ||||
| l--------- | net:osn.sagem/host:osnp1260077/user:hugues/KeyBindings.zsh (renamed from net:osn.sagem/host:osnp1260077/user:g178241/KeyBindings.zsh) | 0 |
3 files changed, 1 insertions, 0 deletions
diff --git a/net:osn.sagem/host:osnp1260077/user:g178241 b/net:osn.sagem/host:osnp1260077/user:g178241 new file mode 120000 index 0000000..5f7df0c --- /dev/null +++ b/net:osn.sagem/host:osnp1260077/user:g178241 @@ -0,0 +1 @@ +user:hugues/
\ No newline at end of file diff --git a/net:osn.sagem/host:osnp1260077/user:g178241/Environment.zsh b/net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh index d94c0e8..d94c0e8 100644 --- a/net:osn.sagem/host:osnp1260077/user:g178241/Environment.zsh +++ b/net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh diff --git a/net:osn.sagem/host:osnp1260077/user:g178241/KeyBindings.zsh b/net:osn.sagem/host:osnp1260077/user:hugues/KeyBindings.zsh index 19de494..19de494 120000 --- a/net:osn.sagem/host:osnp1260077/user:g178241/KeyBindings.zsh +++ b/net:osn.sagem/host:osnp1260077/user:hugues/KeyBindings.zsh |