merge

--HG-- extra : convert_revision : 5390fef726afe14a89f1f36512239f72563557e2
2007-08-04 16:03:18 -07:00 · 2007-08-04 16:03:18 -07:00 · 5364d109d2
commit 5364d109d2
parent 157bd25802 c2b533cc3b
1 changed files with 2 additions and 0 deletions
--- a/.hgignore
+++ b/.hgignore
@ -2,5 +2,7 @@ syntax: glob
 build
 parser.out
 parsetab.py
+cscope.files
+cscope.out
 *.pyc
 *~