Gaetan Semet 781364a35a Merge remote-tracking branch 'upstream/master' ... Conflicts: lib/theme-and-appearance.zsh plugins/tmux/tmux.plugin.zsh		2013-06-05 11:10:38 +02:00
..
zshrc-linux.zsh	updating scripts	2013-03-27 10:15:10 +01:00
zshrc-mac.zsh	disable ssh-agent.	2013-03-27 10:10:33 +01:00
zshrc.zsh-template	Merge remote-tracking branch 'upstream/master'	2013-06-05 11:10:38 +02:00