summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunghyun Kim <jh1114.kim@samsung.com>2013-05-06 16:27:22 +0900
committerJunghyun Kim <jh1114.kim@samsung.com>2013-05-06 16:27:22 +0900
commitf7b8a3ffe949a704bf6083d16ed0c8ad60ebd4be (patch)
tree83cae73766bc49206b6bd054984120154354c111
parent7d07666308f2de5d6c1f946f0e5244550cdcf153 (diff)
parentd7e7a8c598a07e7d14b30acda593c4bd18310ad5 (diff)
downloadsmartsearch-f7b8a3ffe949a704bf6083d16ed0c8ad60ebd4be.tar.gz
smartsearch-f7b8a3ffe949a704bf6083d16ed0c8ad60ebd4be.tar.bz2
smartsearch-f7b8a3ffe949a704bf6083d16ed0c8ad60ebd4be.zip
Merge branch 'master' into tizen_2.1_smack
-rwxr-xr-xNOTICE4
1 files changed, 2 insertions, 2 deletions
diff --git a/NOTICE b/NOTICE
index 4a608b0..01a38b4 100755
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
-Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
+Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
Except as noted, this software is licensed under Flora License, Version 1.1
-Please, see the LICENSE file for Flora License terms and conditions.
+Please, see the LICENSE file for Flora License, Version 1.1 terms and conditions.