merge heads

2012-03-22 12:11:21 -07:00
commit 3044a1daea
565 changed files with 62966 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