diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-07-31 21:33:19 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-07-31 21:33:19 -0700 |
| commit | 06a9d9fc3075df8e07960716c25d1eca2eb47f05 (patch) | |
| tree | 94adfe3467fb50e3710548d6c97f1a6b36ed57a8 /setup.py | |
| parent | 44ce01a70b7926a1e1f4af6692be3bdc671f7318 (diff) | |
| parent | 1383ca19b50ae7463a1f310f007ed120f811b574 (diff) | |
| download | slixmpp-06a9d9fc3075df8e07960716c25d1eca2eb47f05.tar.gz slixmpp-06a9d9fc3075df8e07960716c25d1eca2eb47f05.tar.bz2 slixmpp-06a9d9fc3075df8e07960716c25d1eca2eb47f05.tar.xz slixmpp-06a9d9fc3075df8e07960716c25d1eca2eb47f05.zip | |
Merge branch 'master' into develop
Conflicts:
sleekxmpp/thirdparty/__init__.py
Diffstat (limited to 'setup.py')
| -rwxr-xr-x | setup.py | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -50,6 +50,7 @@ packages = [ 'sleekxmpp', 'sleekxmpp/test', 'sleekxmpp/roster', 'sleekxmpp/util', + 'sleekxmpp/util/sasl', 'sleekxmpp/xmlstream', 'sleekxmpp/xmlstream/matcher', 'sleekxmpp/xmlstream/handler', @@ -59,6 +60,7 @@ packages = [ 'sleekxmpp', 'sleekxmpp/plugins/xep_0009', 'sleekxmpp/plugins/xep_0009/stanza', 'sleekxmpp/plugins/xep_0012', + 'sleekxmpp/plugins/xep_0016', 'sleekxmpp/plugins/xep_0027', 'sleekxmpp/plugins/xep_0030', 'sleekxmpp/plugins/xep_0030/stanza', @@ -105,9 +107,8 @@ packages = [ 'sleekxmpp', 'sleekxmpp/features/feature_bind', 'sleekxmpp/features/feature_session', 'sleekxmpp/features/feature_rosterver', + 'sleekxmpp/features/feature_preapproval', 'sleekxmpp/thirdparty', - 'sleekxmpp/thirdparty/suelta', - 'sleekxmpp/thirdparty/suelta/mechanisms', ] setup( |