merge heads

2011-10-21 13:50:19 -07:00
commit 8326d37806
498 changed files with 62862 additions and 0 deletions
@@ -0,0 +1,11 @@
+syntax:glob
+
+*/bin
+*/gen/**
+*/proguard/**
+.metadata
+MyTracksTest/annotations.log
+**/*.pyc
+**/*.pyo
+syntax: glob
+MyTracksTest/hs_err_pid*.log