rcollier 998245be26 SMACK-412 Fixed merge error. ... git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13591 b35dd754-fafc-0310-a699-88a17e54d16e		2013-03-23 22:23:19 +00:00
..
smack-config.xml	SMACK-412 Fixed merge error.	2013-03-23 22:23:19 +00:00
smack.providers	SMACK-412 Split the ping implementation to a server ping to replace keepalive and a simplified ping manager for manual pings of other entities.	2013-03-19 02:37:36 +00:00