diff options
author | Nathan Fritz <fritzy@netflint.net> | 2011-08-12 16:36:03 -0700 |
---|---|---|
committer | Nathan Fritz <fritzy@netflint.net> | 2011-08-12 16:36:03 -0700 |
commit | 8f1d0e7a79b662e5f2849cea6e73716cc887e226 (patch) | |
tree | ec2fe16b50effd4ba5787a57de00c514fad4f333 /sleekxmpp/__init__.py | |
parent | 88184ff9556774b1be3dc7fcb97f1f71803d2d61 (diff) | |
parent | 9b7ed73f95145f88887d6fc3daa1bd2a9596b943 (diff) | |
download | slixmpp-8f1d0e7a79b662e5f2849cea6e73716cc887e226.tar.gz slixmpp-8f1d0e7a79b662e5f2849cea6e73716cc887e226.tar.bz2 slixmpp-8f1d0e7a79b662e5f2849cea6e73716cc887e226.tar.xz slixmpp-8f1d0e7a79b662e5f2849cea6e73716cc887e226.zip |
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
Diffstat (limited to 'sleekxmpp/__init__.py')
-rw-r--r-- | sleekxmpp/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/__init__.py b/sleekxmpp/__init__.py index a53cfb0e..d2c014d3 100644 --- a/sleekxmpp/__init__.py +++ b/sleekxmpp/__init__.py @@ -15,5 +15,5 @@ from sleekxmpp.xmlstream import XMLStream, RestartStream from sleekxmpp.xmlstream.matcher import * from sleekxmpp.xmlstream.stanzabase import StanzaBase, ET -__version__ = '1.0beta6' -__version_info__ = (1, 0, 0, 'beta6', 0) +__version__ = '1.0rc1' +__version_info__ = (1, 0, 0, 'rc1', 0) |