summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-07-17 10:50:32 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-07-17 10:50:32 -0400
commit48ead3cdd19afcf42f119f72c3f3d73b67cc3210 (patch)
treeaf70ec92b9420ca31b7d6190337a5239cdc7c605
parent5f6a496cf1e870243c27a2575d4390f35ea9885d (diff)
parent7e520d5fd196aad7d5042b02e32dc7a4bbdebbeb (diff)
Merge branch 'master' into work-fc17
-rw-r--r--.git.info.exclude13
1 files changed, 8 insertions, 5 deletions
diff --git a/.git.info.exclude b/.git.info.exclude
index 235367c..064d68c 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,18 @@ 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/libreoffice
.config/transmission
-.netbeans
+.eclipse
.mozilla
+.netbeans \ No newline at end of file