Merge branch 'master' into devel

Conflicts:
	CHANGES.txt

Added FreeBox support.
This commit is contained in:
jevans 2014-01-29 20:16:50 -05:00
commit 9867901d84
9 changed files with 167 additions and 8 deletions

View file

@ -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.

View file

@ -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.