Skip to content

Commit

Permalink
Merge branch 'master' of github.com:nicfit/eyeD3
Browse files Browse the repository at this point in the history
* 'master' of github.com:nicfit/eyeD3:
  Fix small typo in manpage (#63)
  Update pytest from 3.1.2 to 3.1.3 (#60)
  Update sphinx from 1.6.2 to 1.6.3 (#59)
  Update nicfit.py from 0.6 to 0.6.1 (#57)
  • Loading branch information
nicfit committed Jul 21, 2017
2 parents 2ef7262 + 3f43ec0 commit f20b0cc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/eyeD3.1
Expand Up @@ -249,7 +249,7 @@ Remove image matching DESCRIPTION.
\fB--remove-all-images
Remove all images from the tag
.TP
\fB--write--images=\fRDIR
\fB--write-images=\fRDIR
Causes all attached images (APIC frames) to be written to the specified directory.
.TP
\fB--add-object=\fROBJ_PATH:MIME-TYPE[:DESCRIPTION[:FILENAME]]
Expand Down
4 changes: 2 additions & 2 deletions requirements/dev.txt
@@ -1,11 +1,11 @@
Sphinx==1.6.2
Sphinx==1.6.3
check-manifest==0.35
cogapp==2.5.1
flake8==3.3.0
git+https://github.com/nicfit/gitchangelog.git
hg+https://nicfit@bitbucket.org/nicfit/sphinxcontrib-bitbucket
ipdb==0.10.3
nicfit.py[cookiecutter]==0.6
nicfit.py[cookiecutter]==0.6.1
paver==1.2.4
pip-tools==1.9.0
sphinx-issues==0.3.1
Expand Down
2 changes: 1 addition & 1 deletion requirements/test.txt
@@ -1,5 +1,5 @@
factory-boy==2.8.1
nose==1.3.7
pytest==3.1.2
pytest==3.1.3
pytest-cov==2.5.1
pytest-runner==2.11.1

0 comments on commit f20b0cc

Please sign in to comment.