github/SleekXMPP
1
0
Fork 0
mirror of https://github.com/correl/SleekXMPP.git synced 2024-11-24 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity
SleekXMPP/sleekxmpp/xmlstream
History
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
..
handler Tidy up logging calls. 2011-11-19 12:07:57 -08:00
matcher Tidy up logging calls. 2011-11-19 12:07:57 -08:00
__init__.py Underscore names by default. 2010-10-17 22:04:42 -04:00
filesocket.py Cleanup logging and exception handling. 2011-05-31 10:23:05 -07:00
jid.py Explicitly test for inequality in JIDs. 2011-11-14 09:15:43 -08:00
scheduler.py Update scheduler with locks and ability to remove tasks. 2011-08-25 13:34:30 -07:00
stanzabase.py Tidy up logging calls. 2011-11-19 12:07:57 -08:00
test.py moved seesmic branch to trunk 2009-06-03 22:56:51 +00:00
test.xml moved seesmic branch to trunk 2009-06-03 22:56:51 +00:00
testclient.py moved seesmic branch to trunk 2009-06-03 22:56:51 +00:00
tostring.py Clean up and unify tostring once and for all. 2011-08-04 11:41:36 -07:00
xmlstream.py Merge remote-tracking branch 'vijayp/master' into HEAD 2011-11-19 18:23:26 -08:00