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

Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop

Browse source
This commit is contained in:
Lance Stout 2011-01-13 10:20:34 -05:00
commit b71550cec7
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
setup.py
View file

@ -46,7 +46,7 @@ packages = [ 'sleekxmpp',
'sleekxmpp/thirdparty', 'sleekxmpp/thirdparty',
'sleekxmpp/plugins', 'sleekxmpp/plugins',
'sleekxmpp/plugins/xep_0030', 'sleekxmpp/plugins/xep_0030',
'sleekxmpp/plugins/xep_0030/stanza' 'sleekxmpp/plugins/xep_0030/stanza',
'sleekxmpp/plugins/xep_0059', 'sleekxmpp/plugins/xep_0059',
'sleekxmpp/plugins/xep_0092', 'sleekxmpp/plugins/xep_0092',
] ]

2
sleekxmpp/plugins/old_0004.py
View file

@ -6,7 +6,7 @@
See the file LICENSE for copying permission. See the file LICENSE for copying permission.
""" """
from . import base from . import base
import log import logging
from xml.etree import cElementTree as ET from xml.etree import cElementTree as ET
import copy import copy
import logging import logging