merge heads

This commit is contained in:
Jimmy Shih
2012-04-19 11:29:28 -07:00
commit e314f968b8
599 changed files with 63324 additions and 0 deletions
+11
View File
@@ -0,0 +1,11 @@
syntax:glob
*/bin
*/gen/**
*/proguard/**
.metadata
MyTracksTest/AnnotationProcessor.log
**/*.pyc
**/*.pyo
syntax: glob
MyTracksTest/hs_err_pid*.log