Merge "Fix for TDIS-6237" into tizen_2.2

[framework/osp/uifw.git] / NOTICE

diff --git a/NOTICE b/NOTICE
index cca4178..555a379 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -1,9 +1,8 @@
 Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
 Except as noted, this software is licensed under Apache License, Version 2.
 Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
 Except as noted, this software is licensed under Apache License, Version 2.

-Please, see the LICENSE file for Apache License terms and conditions.
+Please, see the LICENSE.APLv2 file for Apache License, Version 2 terms and conditions.

 
 Several source codes may have its original copyright owner and/or
 
 Several source codes may have its original copyright owner and/or

-be licensed under other than Apache License, Version 2, say, Flora License, Version 1.
+be licensed under other than Apache License, Version 2, say, Flora License, Version 1.1

 Please, see copyright and license comments section in the header of each file,
 Please, see copyright and license comments section in the header of each file,

-and the LICENSE.Flora for Flora License terms and conditions.
-
+and the LICENSE.Flora for Flora License, Version 1.1 terms and conditions.