Updated license agreement.

git-svn-id: http://aforge.googlecode.com/svn/trunk@1716 ab5b2c17-5f1b-0410-93cd-b5c26ce635c7
cureos · Jul 15, 2013 · e1e629c · e1e629c
1 parent 7e2cb88
commit e1e629c
Show file tree

Hide file tree

Showing 3 changed files with 685 additions and 5 deletions.
diff --git a/Copyright.txt b/Copyright.txt
@@ -2,7 +2,7 @@ AForge.NET Framework
 http://www.aforgenet.com/framework
 ==================================
 
-Copyright � AForge.NET, 2006-2012
+Copyright � AForge.NET, 2006-2013
 contacts@aforgenet.com
 
 AForge.NET is a C# framework designed for developers and researchers

diff --git a/License.txt b/License.txt
@@ -4,9 +4,15 @@ http://www.aforgenet.com/framework
 
 License agreement
 
-The framework is provided under LGPL v.3 license, which exact definition
-may be found in lgpl-3.0.txt file provided with the framework or on the
-next web page: http://www.gnu.org/licenses/lgpl.html
+Due to some external dependencies, the framework does not have a common
+single license. The AForge.Video.FFMPEG component is GPL v3 licensed, because
+it depends on the GPL build of the FFMPEG library. The rest of the framework
+is LGPL v3 licensed.
 
-Copyright � AForge.NET, 2006-2012
+Both licenses can be found in the gpl-3.0.txt and lgpl-3.0.txt files, or
+the next web pages:
+http://www.gnu.org/licenses/gpl.html
+http://www.gnu.org/licenses/lgpl.html
+
+Copyright � AForge.NET, 2006-2013
 contacts@aforgenet.com