merging

jackllh · Jun 3, 2014 · b29a16e · b29a16e
2 parents a95c055 + 672bfca
commit b29a16e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,7 @@ tools/cache
 *.DS_Store
 *.pyc
 *.svn
-.directory.*
+.directory*
 *~
 *.orig
 *Thumbs.db
diff --git a/.hgignore b/.hgignore
@@ -8,7 +8,7 @@ tools/cache
 *.DS_Store
 *.pyc
 *.svn
-.directory.*
+.directory*
 *~
 *.orig
 *Thumbs.db
diff --git a/.hgsubstate b/.hgsubstate
@@ -1,2 +1,2 @@
 4d06ec29685bc8071439180d401cee8d8aae507c tools/apiclient
-6dde9de86e537d645183dcf9ab337f226c2ec5af tools/w3ctestlib
+18a68dbf013197869d15691f6e03d9ff8e62e84b tools/w3ctestlib