aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2013-12-13 13:03:06 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2013-12-13 13:03:06 +0100
commit58daf59eeeee1818166ca80aabe62c52d4644bda (patch)
tree36ae96707b157e23b14b060e4d5a3496f72d429b /.gitignore
parentcb2b10359dec3a47fd3bc6a35949022b47f905c7 (diff)
parentb7cfd56c894beafbaf4f65594ac25cbcf895cb35 (diff)
downloadvimrc-58daf59eeeee1818166ca80aabe62c52d4644bda.tar.gz
vimrc-58daf59eeeee1818166ca80aabe62c52d4644bda.tar.bz2
vimrc-58daf59eeeee1818166ca80aabe62c52d4644bda.zip
Merge branch 'master' of mpb.li:git/vimrc
Conflicts: .gitignore dotvimrc
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions