Merge with head and address comments.

2010-11-03 12:53:12 -07:00
parent 224c0d759f
commit 7df8025f6a
8 changed files with 96 additions and 44 deletions
@@ -3,3 +3,4 @@ syntax:glob
 */bin
 */gen/**
 .metadata
+MyTracksTest/annotations.log