Merge branch 'master' of https://github.com/d2s/gitignore into d2s-master

defunkt · defunkt · commit 4823407194f3 · 2011-02-21T18:00:14.000-08:00
diff --git a/Autotools.gitignore b/Autotools.gitignore
@@ -1,4 +1,3 @@
-
 # http://www.gnu.org/software/automake
 
 Makefile.in
diff --git a/Global/Mercurial.gitignore b/Global/Mercurial.gitignore
@@ -0,0 +1,3 @@
+/.hg/*
+*/.hg/*
+.hgignore
diff --git a/Global/SVN.gitignore b/Global/SVN.gitignore
@@ -1,2 +1 @@
-/.svn/*
-*/.svn/*
+.svn/
diff --git a/PlayFramework.gitignore b/PlayFramework.gitignore
@@ -4,8 +4,11 @@
 # except for .gitignore
 !.gitignore
 
-# Ignore Play! working directory
-tmp
+# Ignore Play! working directory #
+db
+eclipse
 log
+logs
+server.pid
 test-result
-eclipse
+tmp
diff --git a/Symfony2.gitignore b/Symfony2.gitignore
@@ -0,0 +1,4 @@
+*/logs/*
+*/cache/*
+web/uploads/*
+web/bundles/*
diff --git a/gcov.gitignore b/gcov.gitignore
@@ -0,0 +1,5 @@
+# gcc coverage testing tool files
+
+*.gcno
+*.gcda
+*.gcov

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`# http://www.gnu.org/software/automake`
`3`	`2`
`4`	`3`	`Makefile.in`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +# gcc coverage testing tool files
++
 +*.gcno
 +*.gcda
 +*.gcov