diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-22 20:44:04 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-22 20:44:04 -0400 |
| commit | ad482d55d2f60cf3c91c9014b934af7ea30b4d88 (patch) | |
| tree | 79bb00ec5be01214f1ebc99509308f2083c17717 /.git.info.exclude | |
| parent | 2f550711d01c7aa731d75edca9bc4d2a1f718045 (diff) | |
| parent | 510fea7116c6bd01824af38b4e516b6e19fded81 (diff) | |
Merge branch 'master' into build64-par
Conflicts:
.crontab
Diffstat (limited to '.git.info.exclude')
| -rw-r--r-- | .git.info.exclude | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/.git.info.exclude b/.git.info.exclude index 235367c..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,16 +88,19 @@ 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 -.netbeans +.eclipse .mozilla +.netbeans |