Merge branch 'master' into devel
Conflicts: CHANGES.txt Added FreeBox support.
This commit is contained in:
commit
9867901d84
9 changed files with 167 additions and 8 deletions
|
|
@ -78,7 +78,7 @@ copyright = u'2013, John Evans'
|
|||
# The short X.Y version.
|
||||
version = '0.5'
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = '0.5.9'
|
||||
release = '0.5.10'
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
|
|
|||
|
|
@ -9,3 +9,4 @@ Here's an incomplete list of what I'd like to focus on in the future.
|
|||
* investigate adding write support for UUID/XMP boxes (potentially a big project)
|
||||
* investigate JPIP (likely to be an even bigger project)
|
||||
|
||||
Support for Python 2.6 will be dropped with the 0.6.0 release.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue