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

2011-02-21 18:00:14 -08:00
parent e2adce27c6 a9b0aadc98
commit 4823407194
6 changed files with 20 additions and 7 deletions
@@ -1,4 +1,3 @@
-
 # http://www.gnu.org/software/automake

 Makefile.in
@@ -0,0 +1,3 @@
+/.hg/*
+*/.hg/*
+.hgignore
@@ -1,2 +1 @@
-/.svn/*
-*/.svn/*
+.svn/
@@ -4,8 +4,11 @@
 # except for .gitignore
 !.gitignore

-# Ignore Play! working directory
-tmp
-log
-test-result
+# Ignore Play! working directory #
+db
 eclipse
+log
+logs
+server.pid
+test-result
+tmp
@@ -0,0 +1,4 @@
+*/logs/*
+*/cache/*
+web/uploads/*
+web/bundles/*
@@ -0,0 +1,5 @@
+# gcc coverage testing tool files
+
+*.gcno
+*.gcda
+*.gcov