Gaetan Semet 02e2063325 Merge remote-tracking branch 'cadusk/master' ... # Conflicts: # templates/zshrc-linux.zsh # templates/zshrc-mac.zsh		2016-02-04 14:50:03 +01:00
..
zshrc-linux.zsh	Merge remote-tracking branch 'cadusk/master'	2016-02-04 14:50:03 +01:00
zshrc-mac.zsh	template updates	2016-02-01 17:17:09 -02:00
zshrc.zsh-template	Merge remote-tracking branch 'upstream/master'	2015-08-10 16:15:53 +02:00