slixmpp/sleekxmpp
Lance Stout b54cc97e4c Merge remote-tracking branch 'vijayp/master' into HEAD
Conflicts:
	examples/ping.py
	sleekxmpp/basexmpp.py
	sleekxmpp/clientxmpp.py
	sleekxmpp/features/feature_bind/bind.py
	sleekxmpp/features/feature_mechanisms/mechanisms.py
	sleekxmpp/plugins/gmail_notify.py
	sleekxmpp/plugins/jobs.py
	sleekxmpp/plugins/xep_0009/remote.py
	sleekxmpp/plugins/xep_0009/rpc.py
	sleekxmpp/plugins/xep_0012.py
	sleekxmpp/plugins/xep_0045.py
	sleekxmpp/plugins/xep_0050/adhoc.py
	sleekxmpp/plugins/xep_0078/legacyauth.py
	sleekxmpp/plugins/xep_0085/chat_states.py
	sleekxmpp/plugins/xep_0199/ping.py
	sleekxmpp/plugins/xep_0224/attention.py
	sleekxmpp/xmlstream/handler/waiter.py
	sleekxmpp/xmlstream/matcher/xmlmask.py
	sleekxmpp/xmlstream/xmlstream.py

Conflicts:
	examples/ping.py
	sleekxmpp/basexmpp.py
	sleekxmpp/clientxmpp.py
	sleekxmpp/features/feature_bind/bind.py
	sleekxmpp/features/feature_mechanisms/mechanisms.py
	sleekxmpp/plugins/gmail_notify.py
	sleekxmpp/plugins/jobs.py
	sleekxmpp/plugins/xep_0009/remote.py
	sleekxmpp/plugins/xep_0009/rpc.py
	sleekxmpp/plugins/xep_0012.py
	sleekxmpp/plugins/xep_0045.py
	sleekxmpp/plugins/xep_0050/adhoc.py
	sleekxmpp/plugins/xep_0078/legacyauth.py
	sleekxmpp/plugins/xep_0085/chat_states.py
	sleekxmpp/plugins/xep_0199/ping.py
	sleekxmpp/plugins/xep_0224/attention.py
	sleekxmpp/xmlstream/handler/waiter.py
	sleekxmpp/xmlstream/matcher/xmlmask.py
	sleekxmpp/xmlstream/xmlstream.py
2011-11-19 18:23:26 -08:00
..
features Tidy up logging calls. 2011-11-19 12:07:57 -08:00
plugins Tidy up logging calls. 2011-11-19 12:07:57 -08:00
roster Also fire changed_status when the status text changes for a resource. 2011-11-18 13:57:41 -08:00
stanza This change stops sleekxmpp from spending huge amounts of time unnecessarily computing logging data that may never be used. This is a HUGE performance improvement; in some of my test runs, unnecessary string creation was accounting for > 60% of all CPU time. 2011-11-20 03:39:05 +08:00
test Allow SASL mechanism to be set when creating a ClientXMPP instance. 2011-09-28 22:48:30 -04:00
thirdparty FIX SCRAM-SHA-1-PLUS 2011-10-27 15:16:54 -04:00
xmlstream Merge remote-tracking branch 'vijayp/master' into HEAD 2011-11-19 18:23:26 -08:00
__init__.py Clean and get setup.py working once and for all. 2011-08-24 22:09:02 -07:00
basexmpp.py Merge remote-tracking branch 'vijayp/master' into HEAD 2011-11-19 18:23:26 -08:00
clientxmpp.py Tidy up logging calls. 2011-11-19 12:07:57 -08:00
componentxmpp.py Tidy up logging calls. 2011-11-19 12:07:57 -08:00
exceptions.py Make Iq exceptions more discoverable and simpler to use. 2011-08-19 01:04:20 -07:00
version.py Bump next release version to 1.0-RC4 2011-11-18 16:40:17 -08:00