diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2015-02-06 15:17:51 -0500 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2015-02-06 15:17:51 -0500 |
| commit | dab097d5000c4697761b6985cb3512f7bce0147f (patch) | |
| tree | 7b81b7826a1e23822955560f0f73dc09cda6c8e8 /.config/.gitignore | |
| parent | f50b49ef26f5c692bda1f3f13cd38f9f4f395300 (diff) | |
| parent | a6f973687fb4a1a4558f74f7da595b6902a5dce0 (diff) | |
Merge remote-tracking branch 'origin/master' into purdue-cs/master
Conflicts:
.config/X11/clientrc
.config/bash/rc.d/emacs.sh
.config/cron/make-config
.config/emacs/custom.el
.config/emacs/init.el
.config/git/config
.config/login.sh
.config/selected_editor
.local/bin/config-path
Diffstat (limited to '.config/.gitignore')
| -rw-r--r-- | .config/.gitignore | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/.config/.gitignore b/.config/.gitignore index b5b3b3c..829cfee 100644 --- a/.config/.gitignore +++ b/.config/.gitignore @@ -2,18 +2,20 @@ # Ignore things I don't care enough about to track /Trolltech.conf -/vlc -/purple +/ImageMagick/ +/menus/ +/purple/ +/vlc/ -# some 3d graphics toolkit -/Kitware # KDE color picker -/colors +/colors/ # binary, not helpful to track /dconf/user +/icedtea-web/security/*certs # Ignore these files that if I tracked them, would be a separate repo -/libreoffice -/transmission -/gimp-* -/netbeans +/deluge/ +/gimp-*/ +/libreoffice/ +/netbeans/ +/transmission/ |