Gaetan Semet ad426a6579 Merge remote-tracking branch 'cadusk/master' ... Conflicts: templates/zshrc-mac.zsh		2014-01-02 10:46:36 +01:00
..
zshrc-linux.zsh	Updated linux template.	2013-12-21 23:15:29 -02:00
zshrc-mac.zsh	Merge remote-tracking branch 'cadusk/master'	2014-01-02 10:46:36 +01:00
zshrc.zsh-template	Merge remote-tracking branch 'cadusk/master'	2013-12-19 17:27:55 +01:00