Merging to head.

2011-10-20 20:03:43 -02:00
parent fe33982df7
commit 1b1f3e3d8b
118 changed files with 3449 additions and 703 deletions
@@ -7,3 +7,5 @@ syntax:glob
 MyTracksTest/annotations.log
 **/*.pyc
 **/*.pyo
+syntax: glob
+MyTracksTest/hs_err_pid*.log