summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunghyun Kim <jh1114.kim@samsung.com>2013-05-03 18:20:29 +0900
committerJunghyun Kim <jh1114.kim@samsung.com>2013-05-03 18:20:29 +0900
commit44456cdcb2fa214ba1c89717719cae328786951d (patch)
tree84ce75ed503686a95d39cceb6a2c806ba96bd888
parent76916d513bc5ddef014412deadc15412f6fde1b8 (diff)
parentd7e7a8c598a07e7d14b30acda593c4bd18310ad5 (diff)
downloadsmartsearch-44456cdcb2fa214ba1c89717719cae328786951d.tar.gz
smartsearch-44456cdcb2fa214ba1c89717719cae328786951d.tar.bz2
smartsearch-44456cdcb2fa214ba1c89717719cae328786951d.zip
Merge branch 'master' into tizen_2.1
-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.