← Back to branch summary

~myers-1/pyopenssl/npn

« back to all changes in this revision

Viewing changes to version.py

  • Committer: Jean-Paul Calderone
  • Date: 2010-01-25 22:55:30 UTC
  • mfrom: (126 trunk)
  • mto: This revision was merged to the branch mainline in revision 129.
  • Revision ID: exarkun@divmod.com-20100125225530-5e9nsb6bzoesoz42
merge trunk and resolve simple conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
version.py
5
5
pyOpenSSL - A simple wrapper around the OpenSSL library
6
6
"""
7
7
 
8
 
__version__ = '0.9'
 
8
__version__ = '0.10'