Merge branch 'master' into tizen_2.1

Change-Id: Id7632dd18696fba44431d98ef18a5eafe82b1a7d

diff --git a/debian/changelog b/debian/changelog
index d9df28e..6ba32dc 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+
+ug-setting-wifidirect-efl (1.0.18) precise; urgency=low
+
+  * boilerplate updated
+  * Git: rsa/apps/home/ug-wifi-direct
+  * Tag: libug-setting-wifidirect-efl_1.0.18
+
+ -- Gibyoung Kim <laskgb.kim@samsung.com>  Thu, 2 May 2013 18:12:21 +0900
+
 ug-setting-wifidirect-efl (1.0.17) precise; urgency=low
 
   * Flora license file updated
@@ -5,6 +14,7 @@ ug-setting-wifidirect-efl (1.0.17) precise; urgency=low
   * Tag: libug-setting-wifidirect-efl_1.0.17
 
  -- Gibyoung Kim <laskgb.kim@samsung.com>  Mon, 29 Apr 2013 16:35:15 +0900
+
 ug-setting-wifidirect-efl (1.0.16) precise; urgency=low
 
   * Prevent issue fixed

diff --git a/packaging/libug-setting-wifidirect-efl.spec b/packaging/libug-setting-wifidirect-efl.spec
index aa7e241..25c902e 100755 (executable)
--- a/packaging/libug-setting-wifidirect-efl.spec
+++ b/packaging/libug-setting-wifidirect-efl.spec
@@ -3,7 +3,7 @@
 
 Name:       libug-setting-wifidirect-efl
 Summary:    Wi-Fi Direct setting UI gadget 
-Version:    1.0.17
+Version:    1.0.18
 Release:    1
 Group:      TO_BE_FILLED
 License:    Flora License

diff --git a/popup-wifidirect/include/wfd-app-strings.h b/popup-wifidirect/include/wfd-app-strings.h
index e82b044..9b45fbd 100755 (executable)
--- a/popup-wifidirect/include/wfd-app-strings.h
+++ b/popup-wifidirect/include/wfd-app-strings.h
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/popup-wifidirect/include/wfd-app-util.h b/popup-wifidirect/include/wfd-app-util.h
index 34b401f..1936ab3 100755 (executable)
--- a/popup-wifidirect/include/wfd-app-util.h
+++ b/popup-wifidirect/include/wfd-app-util.h
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/popup-wifidirect/include/wfd-app.h b/popup-wifidirect/include/wfd-app.h
index 160a2e4..5609e23 100755 (executable)
--- a/popup-wifidirect/include/wfd-app.h
+++ b/popup-wifidirect/include/wfd-app.h
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/popup-wifidirect/src/wfd-app-client.c b/popup-wifidirect/src/wfd-app-client.c
index 81f4cda..4ef023b 100755 (executable)
--- a/popup-wifidirect/src/wfd-app-client.c
+++ b/popup-wifidirect/src/wfd-app-client.c
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/popup-wifidirect/src/wfd-app-main.c b/popup-wifidirect/src/wfd-app-main.c
index 17d9b1a..5c73670 100755 (executable)
--- a/popup-wifidirect/src/wfd-app-main.c
+++ b/popup-wifidirect/src/wfd-app-main.c
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/popup-wifidirect/src/wfd-app-popup-view.c b/popup-wifidirect/src/wfd-app-popup-view.c
index 2dd5c97..b658be9 100755 (executable)
--- a/popup-wifidirect/src/wfd-app-popup-view.c
+++ b/popup-wifidirect/src/wfd-app-popup-view.c
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/popup-wifidirect/src/wfd-app-util.c b/popup-wifidirect/src/wfd-app-util.c
index 5bb7a70..4e77cc2 100644 (file)
--- a/popup-wifidirect/src/wfd-app-util.c
+++ b/popup-wifidirect/src/wfd-app-util.c
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/ug-wifidirect/include/wfd_client.h b/ug-wifidirect/include/wfd_client.h
index e6fb2d8..d68128b 100644 (file)
--- a/ug-wifidirect/include/wfd_client.h
+++ b/ug-wifidirect/include/wfd_client.h
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/ug-wifidirect/include/wfd_ug.h b/ug-wifidirect/include/wfd_ug.h
old mode 100755 (executable)
new mode 100644 (file)
index b3ae8a4..1697175
--- a/ug-wifidirect/include/wfd_ug.h
+++ b/ug-wifidirect/include/wfd_ug.h
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/ug-wifidirect/include/wfd_ug_view.h b/ug-wifidirect/include/wfd_ug_view.h
old mode 100755 (executable)
new mode 100644 (file)
index 0783f7f..c6a51e7
--- a/ug-wifidirect/include/wfd_ug_view.h
+++ b/ug-wifidirect/include/wfd_ug_view.h
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/ug-wifidirect/src/wfd_client.c b/ug-wifidirect/src/wfd_client.c
index ff9d919..1be7fab 100755 (executable)
--- a/ug-wifidirect/src/wfd_client.c
+++ b/ug-wifidirect/src/wfd_client.c
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/ug-wifidirect/src/wfd_ug.c b/ug-wifidirect/src/wfd_ug.c
index 45d3493..5a11e43 100755 (executable)
--- a/ug-wifidirect/src/wfd_ug.c
+++ b/ug-wifidirect/src/wfd_ug.c
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/ug-wifidirect/src/wfd_ug_about_view.c b/ug-wifidirect/src/wfd_ug_about_view.c
index 306f091..8c2374b 100755 (executable)
--- a/ug-wifidirect/src/wfd_ug_about_view.c
+++ b/ug-wifidirect/src/wfd_ug_about_view.c
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/ug-wifidirect/src/wfd_ug_genlist.c b/ug-wifidirect/src/wfd_ug_genlist.c
index 9578115..44cceaf 100755 (executable)
--- a/ug-wifidirect/src/wfd_ug_genlist.c
+++ b/ug-wifidirect/src/wfd_ug_genlist.c
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/ug-wifidirect/src/wfd_ug_main_view.c b/ug-wifidirect/src/wfd_ug_main_view.c
index 856e363..b0de726 100755 (executable)
--- a/ug-wifidirect/src/wfd_ug_main_view.c
+++ b/ug-wifidirect/src/wfd_ug_main_view.c
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/ug-wifidirect/src/wfd_ug_multiconnect_view.c b/ug-wifidirect/src/wfd_ug_multiconnect_view.c
index 35a6210..22fbac6 100755 (executable)
--- a/ug-wifidirect/src/wfd_ug_multiconnect_view.c
+++ b/ug-wifidirect/src/wfd_ug_multiconnect_view.c
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/ug-wifidirect/src/wfd_ug_popup.c b/ug-wifidirect/src/wfd_ug_popup.c
index 585ff87..acf60c8 100755 (executable)
--- a/ug-wifidirect/src/wfd_ug_popup.c
+++ b/ug-wifidirect/src/wfd_ug_popup.c
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/ugapp-wifidirect/include/wfd-ugapp-util.h b/ugapp-wifidirect/include/wfd-ugapp-util.h
index 916152c..7480a04 100755 (executable)
--- a/ugapp-wifidirect/include/wfd-ugapp-util.h
+++ b/ugapp-wifidirect/include/wfd-ugapp-util.h
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/ugapp-wifidirect/include/wfd-ugapp.h b/ugapp-wifidirect/include/wfd-ugapp.h
index 3408ae4..ca37530 100755 (executable)
--- a/ugapp-wifidirect/include/wfd-ugapp.h
+++ b/ugapp-wifidirect/include/wfd-ugapp.h
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/ugapp-wifidirect/src/wfd-ugapp-main.c b/ugapp-wifidirect/src/wfd-ugapp-main.c
index 6ba9e81..fe1557e 100755 (executable)
--- a/ugapp-wifidirect/src/wfd-ugapp-main.c
+++ b/ugapp-wifidirect/src/wfd-ugapp-main.c
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/ugapp-wifidirect/src/wfd-ugapp-util.c b/ugapp-wifidirect/src/wfd-ugapp-util.c
index 0307112..2009c3c 100644 (file)
--- a/ugapp-wifidirect/src/wfd-ugapp-util.c
+++ b/ugapp-wifidirect/src/wfd-ugapp-util.c
@@ -1,7 +1,7 @@
 /*
 *  WiFi-Direct UG
 *
-* Copyright 2012-2013 Samsung Electronics Co., Ltd
+* Copyright 2012 Samsung Electronics Co., Ltd
 
 * Licensed under the Flora License, Version 1.1 (the "License");
 * you may not use this file except in compliance with the License.