iNPUTmice 07b07115d6 Merge branch 'feature/foreground_service' into development ... Conflicts: src/main/res/values/strings.xml		2014-11-15 15:51:27 +01:00
..
java/eu/siacs/conversations	Merge branch 'feature/foreground_service' into development	2014-11-15 15:51:27 +01:00
res	Merge branch 'feature/foreground_service' into development	2014-11-15 15:51:27 +01:00
AndroidManifest.xml	initial smp support	2014-11-11 17:40:51 +01:00