Merging to head

2011-05-20 14:42:10 -03:00
commit 1588c25fba
436 changed files with 56058 additions and 0 deletions
@@ -0,0 +1,9 @@
+syntax:glob
+
+*/bin
+*/gen/**
+*/proguard/**
+.metadata
+MyTracksTest/annotations.log
+**/*.pyc
+**/*.pyo