iNPUTmice 7ba9854c22 fixed some disco / carbon related bugs		2014-11-15 17:24:06 +01:00
..
java/eu/siacs/conversations	fixed some disco / carbon related bugs	2014-11-15 17:24:06 +01:00
res	Merge branch 'feature/file_transfer' into development	2014-11-15 15:52:15 +01:00
AndroidManifest.xml	initial smp support	2014-11-11 17:40:51 +01:00