merge messages

2011-04-06 11:29:07 -04:00
parent 9f1bd89a0c
commit 340a1e3e3a
13 changed files with 543 additions and 18 deletions
@@ -5,3 +5,5 @@ syntax:glob
 */proguard/**
 .metadata
 MyTracksTest/annotations.log
+**/*.pyc
+**/*.pyo