merge heads

2011-12-16 16:12:50 -08:00
commit aa392d61e2
550 changed files with 58000 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