Merge branch '7.x-1.x' of http://git.drupal.org/project/video into 7.x-1.x

Conflicts:
	transcoders/video_ffmpeg_php.inc

1 files changed, 0 insertions, 29 deletions

diff --git a/libraries/phpvideotoolkit/adapters/toolkit/join.php b/libraries/phpvideotoolkit/adapters/toolkit/join.php
deleted file mode 100644
index 9d038c0..0000000
--- a/libraries/phpvideotoolkit/adapters/toolkit/join.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-	/* SVN FILE: $Id$ */
-	/**
-	 * @author Oliver Lillie (aka buggedcom) <publicmail@buggedcom.co.uk>
-	 * @package PHPVideoToolkit
-	 * @license BSD
-	 * @copyright 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.
-	 */
-	
-	class PHPVideoToolkit_Join
-	{
-		function __construct()
-		{
-		}
-		function __destruct()
-		{
-		}
-	}