Skip to content

Commit

Permalink
Repo cleanup, update LICENSE, fix version in package.json
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicolas Joyard committed Nov 29, 2015
1 parent f93b41a commit fd86ee1
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 47 deletions.
37 changes: 0 additions & 37 deletions Gruntfile.js

This file was deleted.

4 changes: 2 additions & 2 deletions LICENSE
@@ -1,9 +1,9 @@
(The MIT License)

Copyright (c) 2011 Stefan Schaermeli <schaermu@gmail.com>
Copyright (c) 2011-2015 The fluent-ffmpeg contributors

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
7 changes: 0 additions & 7 deletions build.bat

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "fluent-ffmpeg",
"version": "2.0.0",
"version": "2.0.1",
"description": "A fluent API to FFMPEG (http://www.ffmpeg.org)",
"keywords": [
"ffmpeg"
Expand Down

0 comments on commit fd86ee1

Please sign in to comment.