diff options
| author | David Runge <david.runge@frqrec.com> | 2014-10-06 15:03:21 +0200 |
|---|---|---|
| committer | David Runge <david.runge@frqrec.com> | 2014-10-06 15:03:21 +0200 |
| commit | a3bfd587dd94a04c0d630c2cb9a7b35dd4aa99e2 (patch) | |
| tree | 8d2c2aa52f63a2632d156588fbfcc21924698cba /.gitignore | |
| parent | 8fc239f0d71ee53889bd4c3c63a7dd1124a5847c (diff) | |
| parent | 641776ca9e642e55c974ed3664bfc0a330900ca3 (diff) | |
| download | dotfiles-a3bfd587dd94a04c0d630c2cb9a7b35dd4aa99e2.tar.gz dotfiles-a3bfd587dd94a04c0d630c2cb9a7b35dd4aa99e2.tar.bz2 dotfiles-a3bfd587dd94a04c0d630c2cb9a7b35dd4aa99e2.tar.xz dotfiles-a3bfd587dd94a04c0d630c2cb9a7b35dd4aa99e2.zip | |
Merge branch 'master' of https://github.com/davezerave/dot
* 'master' of https://github.com/davezerave/dot:
Adding systemd suspend alias
Adding iptables syntax for vim
Adding further ignores for arduino and processing settings folder
Moving arduino and processing sketchbook directory to git subdirectory.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -54,7 +54,8 @@ svn/ .Xauthority .android/ .aprc -.arduino/sketchbook +.arduino/console +.arduino/recent.txt .armagetronad/ .audacity-data/ .avidemux/ @@ -281,8 +282,9 @@ svn/ .pdirc .pip/ .pki/ -.processing/ .profile +.processing/console +.processing/recent.txt .pryrc .pulse .pulse-cookie |