Merge "Accessibility changes for DateTimePicker & Fix for TDIS-5084." into tizen_2.1

[platform/framework/native/uifw.git] / NOTICE

diff --git a/NOTICE b/NOTICE
index 13d0a7a..cca4178 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -1,9 +1,9 @@
 Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Flora License, Version 1.
-Please, see the LICENSE.Flora file for Flora License terms and conditions.
+Except as noted, this software is licensed under Apache License, Version 2.
+Please, see the LICENSE file for Apache License terms and conditions.
 
 Several source codes may have its original copyright owner and/or
-be licensed under other than Flora License, Version 1, say, Apache License, Version 2.
+be licensed under other than Apache License, Version 2, say, Flora License, Version 1.
 Please, see copyright and license comments section in the header of each file,
-and the LICENSE.APLv2 for Apache License terms and conditions.
+and the LICENSE.Flora for Flora License terms and conditions.