Sam Whited 73d184352e Remove broken / unused imports		2014-11-19 14:57:23 -05:00
..
java/eu/siacs/conversations	Remove broken / unused imports	2014-11-19 14:57:23 -05:00
res	Merge pull request #691 from kruks23/development	2014-11-19 17:22:57 +01:00
AndroidManifest.xml	initial smp support	2014-11-11 17:40:51 +01:00