| commit | 24688254b380d12a5c48d38e4e19ffe5f2f44dd5 | |
| author | Felix Bechstein <f@ub0r.de> | |
| Sat, 31 Oct 2009 13:22:16 +0000 (31 14:22 +0100) | ||
| committer | Felix Bechstein <f@ub0r.de> | |
| Sat, 31 Oct 2009 13:22:16 +0000 (31 14:22 +0100) | ||
| tree | 281e3c946aa6647d1458e1d6307bff3e08ca5127 | treesnapshot (tar.gz zip) |
| parent | ab41749949c9f837167c8be488858dc19a402968 | commitdiff |
| parent | 6be761b19a11e201863ce8564a58c858969f7307 | commitdiff |
Merge branch 'master' into captcha
Conflicts:
res/values/strings.xml
src/de/ub0r/android/andGMXsms/WebSMS.java
Conflicts:
res/values/strings.xml
src/de/ub0r/android/andGMXsms/WebSMS.java
| res/values-de/strings.xml | diff1 | diff2 | blobhistory |
| res/values/strings.xml | diff1 | diff2 | blobhistory |
| src/de/ub0r/android/andGMXsms/WebSMS.java | diff1 | diff2 | blobhistory |