Permalink
Browse files

Merge branch 'master' into newpages

Conflicts:
	.gitignore
  • Loading branch information...
2 parents 543650c + d64abe3 commit 67b970acc60b32d6aef575ca26328bc5a640005f @aheckmann aheckmann committed Jul 19, 2012
Showing with 6 additions and 2 deletions.
  1. +6 −2 .gitignore
View
@@ -1,5 +1,9 @@
lib-cov
node_modules/
-*.swp
-*.swo
+*.sw*
+*.orig
+benchmarks/benchmarks
+benchmarks/benchmarks2
+benchmarks/benchmarks3
+benchmarks/v8.log
.DS_Store

0 comments on commit 67b970a

Please sign in to comment.