aboutsummaryrefslogtreecommitdiff
path: root/libraries/phpvideotoolkit/LICENSE
diff options
context:
space:
mode:
authorSilvio <silvio@devlet.com.br>2011-07-12 10:26:40 -0300
committerSilvio <silvio@devlet.com.br>2011-07-12 10:26:40 -0300
commit84a089eb09ab21d5062faa3b4021f95da930caaf (patch)
tree04e6efe1d61c0dce3f5c526ab184e89588d7a878 /libraries/phpvideotoolkit/LICENSE
parentd598b738b366190db350b95cebb1e1cf0e1c54c6 (diff)
parentb2eb0df792e7724538c4afeb7d8929a241a03773 (diff)
downloadvideo-84a089eb09ab21d5062faa3b4021f95da930caaf.tar.gz
video-84a089eb09ab21d5062faa3b4021f95da930caaf.tar.bz2
Merge branch '7.x-1.x' of http://git.drupal.org/project/video into 7.x-1.x
Conflicts: transcoders/video_ffmpeg_php.inc
Diffstat (limited to 'libraries/phpvideotoolkit/LICENSE')
-rw-r--r--libraries/phpvideotoolkit/LICENSE18
1 files changed, 0 insertions, 18 deletions
diff --git a/libraries/phpvideotoolkit/LICENSE b/libraries/phpvideotoolkit/LICENSE
deleted file mode 100644
index 944070e..0000000
--- a/libraries/phpvideotoolkit/LICENSE
+++ /dev/null
@@ -1,18 +0,0 @@
-PHPVideoToolkit Copyright (c) 2008 Oliver Lillie <http://www.buggedcom.co.uk>
-
-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. \ No newline at end of file