diff options
| author | David Runge <dave@sleepmap.de> | 2017-12-20 22:49:16 +0100 |
|---|---|---|
| committer | David Runge <dave@sleepmap.de> | 2017-12-20 22:49:16 +0100 |
| commit | fb62e74e683b98b307815a931a959cbb3991fcd8 (patch) | |
| tree | dda4bb6531a2b1a312785879d71826ca20c33bbe /.gitignore | |
| parent | 0105563a402e3fc057f58cb8861fd79391a7d95f (diff) | |
| parent | 9f64bd96586f944a1a95404adcbc5a172482f0a4 (diff) | |
| download | dotfiles-fb62e74e683b98b307815a931a959cbb3991fcd8.tar.gz dotfiles-fb62e74e683b98b307815a931a959cbb3991fcd8.tar.bz2 dotfiles-fb62e74e683b98b307815a931a959cbb3991fcd8.tar.xz dotfiles-fb62e74e683b98b307815a931a959cbb3991fcd8.zip | |
Merge branch 'master' of sleepmap.de:config/dotfiles
* 'master' of sleepmap.de:config/dotfiles:
.gitignore: Adding packages/ folder to ignore. Removing unused folders from ignore list.
.config/conky/blckbx-*: Adding conky configurations for blckbx.
.gnupg/dirmngr_ldapservers.conf: Adding empty configuration, so that dirmngr won't complain.
.makepkg.conf: Adding default BUILDDIR /tmp/makepkg.
.config/SuperCollider/startup.scd: Automatically initializing and connecting MIDI devices.
.ssh/config: Adding global trvlr ssh config.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -42,11 +42,9 @@ Pictures/ Videos/ backup/ bin/pass2offlineimapc -build/ -git/ -make/ cloud/ -svn/ +git/ +packages/ .ICEauthority .Mathematica/ |