| commit | 4ec526680abf1bb8a93a48cf1c8c423a0de074d6 | |
| author | Felix Bechstein <f@ub0r.de> | |
| Thu, 22 Oct 2009 05:14:48 +0000 (22 07:14 +0200) | ||
| committer | Felix Bechstein <f@ub0r.de> | |
| Thu, 22 Oct 2009 05:14:48 +0000 (22 07:14 +0200) | ||
| tree | 9247c560f5a911de6804a1c4a7a13e1e2f274b54 | treesnapshot (tar.gz zip) |
| parent | a7586ff465cce8b72850ace6e00a44cbbda71d8b | commitdiff |
| parent | a0862685e6f42b4bf2bd94337a2dcfa18dd6927c | commitdiff |
Merge branch 'master' into captcha
Conflicts:
src/de/ub0r/android/andGMXsms/ConnectorO2.java
src/de/ub0r/android/andGMXsms/WebSMS.java
Conflicts:
src/de/ub0r/android/andGMXsms/ConnectorO2.java
src/de/ub0r/android/andGMXsms/WebSMS.java
| src/de/ub0r/android/andGMXsms/WebSMS.java | diff1 | diff2 | blobhistory |