diff options
author | Hugues Hiegel <hugues@hiegel.fr> | 2008-09-30 10:51:08 +0200 |
---|---|---|
committer | Hugues Hiegel <hugues@hiegel.fr> | 2008-09-30 10:51:08 +0200 |
commit | fa444fdc32225b369256dbad4bc4a43eeaa358e3 (patch) | |
tree | 82cf03da8161a18b2eddc67c5b968ee44f934830 | |
parent | d538bb1e74df6c525f53f18d7afb82ff9c1ab87f (diff) | |
parent | 1e944a94a5c5d950e0ca8d8b3b14a910f87f34d6 (diff) |
Merge commit 'origin/master'
Conflicts:
net:sweethome/host:delphine/user:hugues
-rw-r--r-- | .zlogin | 2 | ||||
l--------- | net:sweethome/host:delphine/user:hugues | 1 | ||||
-rw-r--r-- | net:sweethome/host:delphine/user:hugues/KeyBindings.zsh | 1 |
3 files changed, 2 insertions, 2 deletions
@@ -8,7 +8,7 @@ then if [ "$TODAY" != "$LATEST" ] then - when w --calendar=~/.when/birthdays > ~/.when/.today + when w --calendar=~/.when/birthdays | tail -n+3 > ~/.when/.today fi if [ -s ~/.when/.today ] diff --git a/net:sweethome/host:delphine/user:hugues b/net:sweethome/host:delphine/user:hugues new file mode 120000 index 0000000..567674a --- /dev/null +++ b/net:sweethome/host:delphine/user:hugues @@ -0,0 +1 @@ +../host:paranoid/user:hugues
\ No newline at end of file diff --git a/net:sweethome/host:delphine/user:hugues/KeyBindings.zsh b/net:sweethome/host:delphine/user:hugues/KeyBindings.zsh deleted file mode 100644 index 64f746e..0000000 --- a/net:sweethome/host:delphine/user:hugues/KeyBindings.zsh +++ /dev/null @@ -1 +0,0 @@ -bindkey -s 'm' 'Q mails\n' |