Merge branch 'master' of github.com:tomru/Dotfiles

Browse Source

Conflicts:
	oh-my-zsh
	zshrc

...

This commit is contained in:

Thomas Ruoff

2012-10-09 12:08:38 +02:00

parent 87c0ed5bf4 22a5603976

commit 9e10be7bec

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

oh-my-zsh

Submodule oh-my-zsh updated: 61ebc46beb...c443926e28