X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=COPYING;h=374943878c3a9b2c4bbe7357419dd3bc4be8ff51;hb=893bff8c7baf8d11d2ef3c0a725b098cb0c081eb;hp=379cbb331e04ea076a5143e95cb4a9e0283f100c;hpb=0309f16081932cfad83bfb89f2957f3287836074;p=platform%2Fframework%2Fweb%2Fweb-ui-fw.git diff --git a/COPYING b/COPYING index 379cbb3..3749438 100644 --- a/COPYING +++ b/COPYING @@ -2,6 +2,7 @@ This software is licensed under the MIT license (as defined by the OSI at http://www.opensource.org/licenses/mit-license.php), except for following files: * src/js/jquery.mobile.tizen.pinch.js. + * src/js/widgets/jquery.mobile.tizen.gallery3d.js **************************************************************************** Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. @@ -28,10 +29,12 @@ THE SOFTWARE. The following files are licensed under Flora license. * src/js/jquery.mobile.tizen.pinch.js. + * src/js/widgets/jquery.mobile.tizen.gallery3d.js + **************************************************************************** Flora License -Version 1.0, April, 2013 +Version 1.1, April, 2013 http://floralicense.org/license/ @@ -223,7 +226,7 @@ identification within third-party archives. Copyright [yyyy] [name of copyright owner] - Licensed under the Flora License, Version 1.0 (the "License"); + Licensed under the Flora License, Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at @@ -258,4 +261,4 @@ jQuery (http://jquery.com/) [MIT license] Globalize (http://github.com/jquery/globalize/) [MIT license] -glMatrix 1.3.7 (https://github.com/toji/gl-matrix) [https://github.com/toji/gl-matrix/blob/master/LICENSE.md] \ No newline at end of file +glMatrix 1.3.7 (https://github.com/toji/gl-matrix) [https://github.com/toji/gl-matrix/blob/master/LICENSE.md]