Merge remote-tracking branch 'origin/master'

2012-08-29 20:28:44 +04:00
parent b7b0dd0146 8c1f4c9ca4
commit c834c4cf0f
1 changed files with 2 additions and 1 deletions
@@ -19,4 +19,5 @@ tmp
 .*.swp
 gh-pages
 *.class
-.DS_Store
+.DS_Store
 android.tests.dependencies