summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscrvisitor <scrvisitor@MCD2.(none)>2013-01-23 15:32:05 +0400
committerscrvisitor <scrvisitor@MCD2.(none)>2013-01-23 15:32:05 +0400
commit265e08d86e39a8c4674a8b554f36dc278d22c9ae (patch)
tree03b2692cc4bef5b33fdd8c23011814d7dbea355d
parentf4c39f9215bce1c931585e8cc4173166ac3d27af (diff)
parent57e010540b12628c3b075562a9ddcf48a8119580 (diff)
downloadsmartsearch-265e08d86e39a8c4674a8b554f36dc278d22c9ae.tar.gz
smartsearch-265e08d86e39a8c4674a8b554f36dc278d22c9ae.tar.bz2
smartsearch-265e08d86e39a8c4674a8b554f36dc278d22c9ae.zip
Merge branch 'master' into tizen_2.0
Conflicts: NOTICE NOTICE.Flora
-rwxr-xr-xNOTICE5
-rwxr-xr-xNOTICE.Flora5
2 files changed, 10 insertions, 0 deletions
diff --git a/NOTICE b/NOTICE
new file mode 100755
index 0000000..ffacf89
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,5 @@
+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 file for Flora License terms and conditions.
+
+
diff --git a/NOTICE.Flora b/NOTICE.Flora
index f4521df..eeb9180 100755
--- a/NOTICE.Flora
+++ b/NOTICE.Flora
@@ -1,3 +1,8 @@
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 file for Flora License terms and conditions.
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> master