merge heads

2026-10-11 05:23:07 +02:00 · 2012-04-10 10:31:02 -07:00
commit 2fbdb9bfef
582 changed files with 62438 additions and 0 deletions
@@ -0,0 +1,11 @@
+syntax:glob
+
+*/bin
+*/gen/**
+*/proguard/**
+.metadata
+MyTracksTest/AnnotationProcessor.log
+**/*.pyc
+**/*.pyo
+syntax: glob
+MyTracksTest/hs_err_pid*.log