Daniel Gultsch 52a43db6d6 Merge pull request #721 from SamWhited/warning_fixes ... Warning "fixes"		2014-11-29 19:14:13 +01:00
..
java/eu/siacs/conversations	Merge pull request #721 from SamWhited/warning_fixes	2014-11-29 19:14:13 +01:00
res	Merge pull request #721 from SamWhited/warning_fixes	2014-11-29 19:14:13 +01:00
AndroidManifest.xml	initial smp support	2014-11-11 17:40:51 +01:00