aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorDavid Runge <david.runge@frqrec.com>2014-06-17 16:14:19 +0200
committerDavid Runge <david.runge@frqrec.com>2014-06-17 16:14:19 +0200
commitcde6bd16bb48f0aecf98b656a9dcfef629e24d95 (patch)
tree2fa89aff5efa703597710368dece60913befaf71 /.gitmodules
parentac876bcfe938849005309a2cb5da01451094c81c (diff)
parent3b44361df3ede6208faa6fc97d584d33889dedf5 (diff)
downloaddotfiles-cde6bd16bb48f0aecf98b656a9dcfef629e24d95.tar.gz
dotfiles-cde6bd16bb48f0aecf98b656a9dcfef629e24d95.tar.bz2
dotfiles-cde6bd16bb48f0aecf98b656a9dcfef629e24d95.tar.xz
dotfiles-cde6bd16bb48f0aecf98b656a9dcfef629e24d95.zip
Merge branch 'master' of https://github.com/davezerave/dot
Merging local and work settings for additional vundles * 'master' of https://github.com/davezerave/dot: Adding bindings for vi-copy mode in tmux Adding more work related ignores Adding octave support Retabbing, customizing to my user Adding more bbb specific JACK settings Conflicts: .vundles.local
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions