Merge branch 'master' into tizen_2.0

19 files changed, 38 insertions, 38 deletions

diff --git a/LICENSE b/LICENSE
index 7ccb5b5..cc8727b 100755
--- a/LICENSE
+++ b/LICENSE
@@ -2,7 +2,7 @@ Flora License
 
 Version 1.0, May, 2012
 
-http://www.tizenopensource.org/license
+http://floralicense.org/license/
 
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -66,7 +66,7 @@ To apply the Flora License to your work, attach the following boilerplate notice
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.tizenopensource.org/license
+       http://floralicense.org/license/
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/data/groups/search_custom_style.edc b/data/groups/search_custom_style.edc
index 3c19bee..e4a78dc 100755
--- a/data/groups/search_custom_style.edc
+++ b/data/groups/search_custom_style.edc
@@ -1,11 +1,11 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2012-2013 Samsung Electronics Co., Ltd/
  *
  * Licensed under the Flora License, Version 1.0 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.tizenopensource.org/license
+ *     http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an AS IS BASIS,
diff --git a/data/groups/search_result.edc b/data/groups/search_result.edc
index 246f935..6f311a6 100755
--- a/data/groups/search_result.edc
+++ b/data/groups/search_result.edc
@@ -1,11 +1,11 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2012-2013 Samsung Electronics Co., Ltd/
  *
  * Licensed under the Flora License, Version 1.0 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.tizenopensource.org/license
+ *     http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an AS IS BASIS,
diff --git a/data/smartsearch-color.edc b/data/smartsearch-color.edc
index 1cb6505..4deb85d 100755
--- a/data/smartsearch-color.edc
+++ b/data/smartsearch-color.edc
@@ -1,11 +1,11 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2012-2013 Samsung Electronics Co., Ltd/
  * 
  * Licensed under the Flora License, Version 1.0 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * 
- *     http://www.tizenopensource.org/license
+ *     http://floralicense.org/license/
  * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an AS IS BASIS,
diff --git a/data/smartsearch.edc b/data/smartsearch.edc
index 5a64d39..8d6a09f 100755
--- a/data/smartsearch.edc
+++ b/data/smartsearch.edc
@@ -1,11 +1,11 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2012-2013 Samsung Electronics Co., Ltd/
  *
  * Licensed under the Flora License, Version 1.0 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.tizenopensource.org/license
+ *     http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an AS IS BASIS,
diff --git a/include/common_util.h b/include/common_util.h
index 6c4a02f..4d9f5cc 100755
--- a/include/common_util.h
+++ b/include/common_util.h
@@ -1,11 +1,11 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2012-2013 Samsung Electronics Co., Ltd/
  *
  * Licensed under the Flora License, Version 1.0 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.tizenopensource.org/license
+ *     http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an AS IS BASIS,
diff --git a/include/ps_app_interface.h b/include/ps_app_interface.h
index b2029b3..ecb55ad 100755
--- a/include/ps_app_interface.h
+++ b/include/ps_app_interface.h
@@ -1,11 +1,11 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2012-2013 Samsung Electronics Co., Ltd/
  *
  * Licensed under the Flora License, Version 1.0 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.tizenopensource.org/license
+ *     http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an AS IS BASIS,
diff --git a/include/ps_debug_util.h b/include/ps_debug_util.h
index 4b064c4..bf4f212 100755
--- a/include/ps_debug_util.h
+++ b/include/ps_debug_util.h
@@ -1,11 +1,11 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2012-2013 Samsung Electronics Co., Ltd/
  *
  * Licensed under the Flora License, Version 1.0 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.tizenopensource.org/license
+ *     http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an AS IS BASIS,
diff --git a/include/ps_makeupviews.h b/include/ps_makeupviews.h
index 5d7d8fa..d64e0c6 100755
--- a/include/ps_makeupviews.h
+++ b/include/ps_makeupviews.h
@@ -1,11 +1,11 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2012-2013 Samsung Electronics Co., Ltd/
  *
  * Licensed under the Flora License, Version 1.0 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.tizenopensource.org/license
+ *     http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an AS IS BASIS,
diff --git a/include/ps_searcher.h b/include/ps_searcher.h
index df3e55e..0749dad 100755
--- a/include/ps_searcher.h
+++ b/include/ps_searcher.h
@@ -1,11 +1,11 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2012-2013 Samsung Electronics Co., Ltd/
  *
  * Licensed under the Flora License, Version 1.0 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.tizenopensource.org/license
+ *     http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an AS IS BASIS,
diff --git a/include/search_bar.h b/include/search_bar.h
index c2b2521..e9be2b9 100755
--- a/include/search_bar.h
+++ b/include/search_bar.h
@@ -1,11 +1,11 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2012-2013 Samsung Electronics Co., Ltd/
  *
  * Licensed under the Flora License, Version 1.0 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.tizenopensource.org/license
+ *     http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an AS IS BASIS,
diff --git a/include/smartsearch.h b/include/smartsearch.h
index 0a3cfa6..0726a6f 100755
--- a/include/smartsearch.h
+++ b/include/smartsearch.h
@@ -1,11 +1,11 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2012-2013 Samsung Electronics Co., Ltd/
  *
  * Licensed under the Flora License, Version 1.0 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.tizenopensource.org/license
+ *     http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an AS IS BASIS,
diff --git a/include/smartsearch_define.h b/include/smartsearch_define.h
index d58d7b7..0894c6f 100755
--- a/include/smartsearch_define.h
+++ b/include/smartsearch_define.h
@@ -1,11 +1,11 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2012-2013 Samsung Electronics Co., Ltd/
  *
  * Licensed under the Flora License, Version 1.0 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.tizenopensource.org/license
+ *     http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an AS IS BASIS,
diff --git a/src/common_util.cpp b/src/common_util.cpp
index e624ffb..101b732 100755
--- a/src/common_util.cpp
+++ b/src/common_util.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2012-2013 Samsung Electronics Co., Ltd/
  *
  * Licensed under the Flora License, Version 1.0 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.tizenopensource.org/license
+ *     http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an AS IS BASIS,
diff --git a/src/ps_app_interface.cpp b/src/ps_app_interface.cpp
index 3c9bc88..dbecb51 100755
--- a/src/ps_app_interface.cpp
+++ b/src/ps_app_interface.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2012-2013 Samsung Electronics Co., Ltd/
  *
  * Licensed under the Flora License, Version 1.0 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.tizenopensource.org/license
+ *     http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an AS IS BASIS,
diff --git a/src/ps_makeupviews.cpp b/src/ps_makeupviews.cpp
index f845f7d..6d21aa8 100755
--- a/src/ps_makeupviews.cpp
+++ b/src/ps_makeupviews.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2012-2013 Samsung Electronics Co., Ltd/
  *
  * Licensed under the Flora License, Version 1.0 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.tizenopensource.org/license
+ *     http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an AS IS BASIS,
diff --git a/src/ps_searcher.cpp b/src/ps_searcher.cpp
index c6ad4c0..bdd8eb6 100755
--- a/src/ps_searcher.cpp
+++ b/src/ps_searcher.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2012-2013 Samsung Electronics Co., Ltd/
  *
  * Licensed under the Flora License, Version 1.0 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.tizenopensource.org/license
+ *     http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an AS IS BASIS,
diff --git a/src/search_bar.cpp b/src/search_bar.cpp
index 1ced446..a56ed2a 100755
--- a/src/search_bar.cpp
+++ b/src/search_bar.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2012-2013 Samsung Electronics Co., Ltd/
  *
  * Licensed under the Flora License, Version 1.0 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.tizenopensource.org/license
+ *     http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an AS IS BASIS,
diff --git a/src/smartsearch.cpp b/src/smartsearch.cpp
index fe1e9d1..ef71695 100755
--- a/src/smartsearch.cpp
+++ b/src/smartsearch.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2012-2013 Samsung Electronics Co., Ltd/
  *
  * Licensed under the Flora License, Version 1.0 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.tizenopensource.org/license
+ *     http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an AS IS BASIS,