Public Git Hosting - andGMXsms.git/commit

Merge branch 'arcor' into flx

Conflicts:
src/de/ub0r/android/andGMXsms/WebSMS.java

WebSMS for Android phones

res/layout/about.xml	diff1 \|	diff2 \|	blob \| history
res/values-de/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	diff1 \|	diff2 \|	blob \| history
res/xml/prefs.xml	diff1 \|	diff2 \|	blob \| history
src/de/ub0r/android/andGMXsms/Connector.java	diff1 \|	diff2 \|	blob \| history
src/de/ub0r/android/andGMXsms/ConnectorArcor.java	\|	diff2 \|	blob \| history
src/de/ub0r/android/andGMXsms/WebSMS.java	diff1 \|	diff2 \|	blob \| history