| commit | 4c0d20e1f4eb73be6df9418a6949cfbcecd314e6 | |
| author | Felix Bechstein <f@ub0r.de> | |
| Sun, 8 Nov 2009 19:00:13 +0000 (8 20:00 +0100) | ||
| committer | Felix Bechstein <f@ub0r.de> | |
| Sun, 8 Nov 2009 19:00:13 +0000 (8 20:00 +0100) | ||
| tree | 1335e953e17520c176b1458df0ff7af9418c6d9e | treesnapshot (tar.gz zip) |
| parent | 276983acf89626244480850e02f433045309086f | commitdiff |
| parent | 534d09e79f7e69ba006d50495a6da9d46c5bfc20 | commitdiff |
Merge branch 'api4+5'
Conflicts:
src/de/ub0r/android/andGMXsms/IOService.java
Conflicts:
src/de/ub0r/android/andGMXsms/IOService.java
| src/de/ub0r/android/andGMXsms/IOService.java | diff1 | diff2 | blobhistory |