Skip to content

Commit

Permalink
Merge pull request nareix#18 from nareix/develop
Browse files Browse the repository at this point in the history
dev => master
  • Loading branch information
nareix authored Dec 21, 2016
2 parents 29ab47d + 2dfcc0e commit cdca0d6
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,3 @@ ffmpeg.VideoEncoder / ffmpeg.SWScale
# License

MIT

0 comments on commit cdca0d6

Please sign in to comment.