]> ruderich.org/simon Gitweb - config/dotfiles.git/commitdiff
ruderich.org/simon / config / dotfiles.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c89813f b122832)
Merge remote-tracking branch 'all-my-faults/master'
authorSimon Ruderich <simon@ruderich.org>
Fri, 25 Nov 2011 14:51:13 +0000 (15:51 +0100)
committerSimon Ruderich <simon@ruderich.org>
Fri, 25 Nov 2011 14:51:13 +0000 (15:51 +0100)
Conflicts:
vimrc

1  2 
vimrc patch | diff1 | diff2 | blob | history

diff --cc vimrc
Simple merge
Configuration files for zsh, vim, git, mutt, herbstluftwm and a few more shell and X11 related programs