Permalink
Browse files

Merge remote branch 'upstream/master'

  • Loading branch information...
2 parents 298f853 + 2684ef6 commit 0d820cedf4884359b4440d23ae84bf54ade8eeab @jroper jroper committed Feb 10, 2011
Showing with 7 additions and 0 deletions.
  1. +2 −0 .gitignore
  2. +1 −0 src/parser-tests/superfast/ignore.txt
  3. +4 −0 testsuite/.gitignore
View
@@ -0,0 +1,2 @@
+build
+dist
@@ -0,0 +1 @@
+
View
@@ -0,0 +1,4 @@
+dist
+tmp
+test-results
+embedded/tomcat/work

0 comments on commit 0d820ce

Please sign in to comment.