summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-07-17 10:59:25 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-07-17 10:59:25 -0400
commit01583932af5fd2594e603c5f26591c50217f14c7 (patch)
tree8dd5253ff2c6208a377d1215547474b634be0065
parent08db433d574932b3bbeeea37bc7f8084d2e5d5bb (diff)
parent1e21630f10a42654f999b76ed8337abd960c5ab9 (diff)
Merge branch 'master' into work-fc17
-rw-r--r--.git.info.exclude3
1 files changed, 2 insertions, 1 deletions
diff --git a/.git.info.exclude b/.git.info.exclude
index 064d68c..4576b6f 100644
--- a/.git.info.exclude
+++ b/.git.info.exclude
@@ -98,8 +98,9 @@ history.*
.wine*
# Ignore these files that if I tracked them, would be a separate repo
+.config/chromium
.config/libreoffice
.config/transmission
.eclipse
.mozilla
-.netbeans \ No newline at end of file
+.netbeans