Thomas Ruoff 15937faba3 Merge remote-tracking branch 'origin/master' into everard ...

Conflicts:
	zsh/bundle/oh-my-zilsh

2014-08-11 17:55:54 +02:00

oh-my-zsh @ 1b7a3ea99a

remove zilsh wrapper

2014-08-03 00:14:24 +02:00

vim

add snipmate and mustache templates

2014-07-02 00:29:21 +02:00

.gitignore

Update vundle for vim

2014-06-15 23:48:56 +02:00

.gitmodules

remove zilsh wrapper

2014-08-03 00:14:24 +02:00

dircolors

add dircolors

2012-04-01 12:55:34 +02:00

gitconfig

remove bc3 as git's mergetool

2014-07-16 11:51:18 +02:00

screenrc

use screenrc from seth house for now

2012-11-04 00:31:49 +01:00

setup.sh

add a setup script for my dotfiles

2011-06-03 00:12:25 +02:00

vimrc

add tpope's surround to vim

2014-07-27 13:01:57 +02:00

xinitrc

make xinitrc hostname specific

2014-05-18 00:09:56 +02:00

Xresources

use different term colours

2014-06-18 14:57:58 +02:00

zshrc

Merge remote-tracking branch 'origin/master' into everard

2014-08-11 17:55:54 +02:00

Description

No description provided

678 KiB

Languages

Vim Script 92.4%

Vim Snippet 6.2%

Shell 1.4%