Merged remote changes

2011-01-05 09:00:36 +01:00
parent ead876036d
commit cb533c954b
44 changed files with 3302 additions and 534 deletions
@@ -2,5 +2,6 @@ syntax:glob

 */bin
 */gen/**
+*/proguard/**
 .metadata
 MyTracksTest/annotations.log