iNPUTmice 2b21bc13fc Merge branch 'master' into development		2014-11-16 00:34:44 +01:00
..
java/eu/siacs/conversations	Merge branch 'master' into development	2014-11-16 00:34:44 +01:00
res	Update Spanish Translations	2014-11-15 20:48:31 +01:00
AndroidManifest.xml	initial smp support	2014-11-11 17:40:51 +01:00