diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-21 22:39:19 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-21 22:39:19 -0400 |
| commit | bc4a3914db8b294238df438750863214bdb83f4d (patch) | |
| tree | 18d1023524b22ea2eee292a8ba603cece46d9768 /.git.info.exclude | |
| parent | ae33398b4eefc8fd729c201c984126960d579afc (diff) | |
| parent | 69e7a06e976bbad54684b8c650853020c8352adb (diff) | |
Merge branch 'master' into hp-dv6426us-par
Conflicts:
.emacs.d/custom.el
Diffstat (limited to '.git.info.exclude')
| -rw-r--r-- | .git.info.exclude | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/.git.info.exclude b/.git.info.exclude index 048e924..4576b6f 100644 --- a/.git.info.exclude +++ b/.git.info.exclude @@ -54,6 +54,7 @@ history.* .current.asound .dbus/session-bus/* .ddd/history +.ddd/sessions .dvdcss .esd_auth .eshell/history @@ -87,15 +88,17 @@ history.* .config/libretools/blacklist.txt # Ignore these files for no good reason -.terminfo -.config/vlc/vlc-qt-interface.conf -.wine* -.offlineimap .bogofilter .config/Trolltech.conf +.config/vlc/vlc-qt-interface.conf .gem +.offlineimap +.prefix +.terminfo +.wine* # Ignore these files that if I tracked them, would be a separate repo +.config/chromium .config/libreoffice .config/transmission .eclipse |