From 004b032a54952c99cf856d2c92c9e4afb3692770 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sun, 2 Dec 2012 13:16:10 -0800 Subject: [PATCH] Update LICENSE --- aegisub/LICENCE | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/aegisub/LICENCE b/aegisub/LICENCE index 0ae4666a7..64032a465 100644 --- a/aegisub/LICENCE +++ b/aegisub/LICENCE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2010, Aegisub Project +Copyright (c) 2004-2012, Aegisub Project All rights reserved. Redistribution and use in source and binary forms, with or without @@ -26,16 +26,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --- END AEGISUB LICENSE -- -Any file that does not have a license in the header is covered by the above -license with exception to any directories that contain a license file, or are +Any file that does not have a license in the header is covered by the above +license with exception to any directories that contain a license file, or are covered by another license in the file itself. -The following directories and file are covered by their respective licenses as +The following directories and file are covered by their respective licenses as follows: -src/boost/ - - Boost Software License Version 1.0 see src/boost/LICENSE_1_0.txt. - src/gl/ - MIT license. See src/gl/glext.h