Merge branch 'xdebug_2_1'

derickr · Aug 12, 2011 · 871bcf3 · 871bcf3
2 parents 5a3cc5b + 52c5a40
commit 871bcf3
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,7 @@
 /config.guess
 /*swo
 /*swp
+/*swo
 /config.log
 /libtool
 /Debug
@@ -52,3 +53,4 @@
 /tmp-php.ini
 .svn
 /*~
+/debugclient/*.o