Merge to head

This commit is contained in:
Rodrigo Damazio
2012-01-02 19:03:07 -02:00
parent 1bd6e53f04
commit c3912042e9
125 changed files with 1852 additions and 3675 deletions
+1 -1
View File
@@ -9,4 +9,4 @@
android.library=true
# Project target.
target=android-14
target=android-15