| commit | 1a37ab83526802654c6722e81a0920d51128434a | |
| author | Felix Bechstein <f@ub0r.de> | |
| Fri, 15 Jan 2010 18:08:23 +0000 (15 19:08 +0100) | ||
| committer | Felix Bechstein <f@ub0r.de> | |
| Fri, 15 Jan 2010 18:08:23 +0000 (15 19:08 +0100) | ||
| tree | ed336385124bdf8d94b1a0c72b0e6f699dd23a05 | treesnapshot (tar.gz zip) |
| parent | ec2fef9bebe9079d4b043606978539fdef0878bb | commitdiff |
| parent | f2cfef61cda988cc0a6ae98e7c919825ed96a9a3 | commitdiff |
Merge branch 'arcor' into flx
Conflicts:
res/values-de/strings.xml
res/values/strings.xml
res/xml/prefs.xml
src/de/ub0r/android/andGMXsms/ConnectorArcor.java
Conflicts:
res/values-de/strings.xml
res/values/strings.xml
res/xml/prefs.xml
src/de/ub0r/android/andGMXsms/ConnectorArcor.java