summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Gibyoung <lastkgb.kim@samsung.com>2013-04-23 08:16:25 (GMT)
committerKim Gibyoung <lastkgb.kim@samsung.com>2013-04-23 08:16:35 (GMT)
commit90aee208b217e79bd2a4b38edded7c1f358be35a (patch)
treecb622f89e91c1000c0fa734155e0d0a5179bd202
parent9fa7ae61cada4c9ea1123b65b3d49375f545c3d6 (diff)
parentaebaf1afb091dc41d7f5d886f516445f940ac7aa (diff)
downloadug-wifi-direct-90aee208b217e79bd2a4b38edded7c1f358be35a.zip
ug-wifi-direct-90aee208b217e79bd2a4b38edded7c1f358be35a.tar.gz
ug-wifi-direct-90aee208b217e79bd2a4b38edded7c1f358be35a.tar.bz2
Merge branch 'master' into tizen_2.1
Change-Id: I9ffef11bdfe7c0857e9eb906119ab0e28fad546d
-rwxr-xr-xpopup-wifidirect/include/wfd-app-strings.h2
-rwxr-xr-xpopup-wifidirect/include/wfd-app-util.h2
-rwxr-xr-xpopup-wifidirect/include/wfd-app.h2
-rwxr-xr-xpopup-wifidirect/src/wfd-app-client.c2
-rwxr-xr-xpopup-wifidirect/src/wfd-app-main.c2
-rwxr-xr-xpopup-wifidirect/src/wfd-app-popup-view.c2
-rw-r--r--popup-wifidirect/src/wfd-app-util.c2
-rw-r--r--ug-wifidirect/include/wfd_client.h2
-rwxr-xr-xug-wifidirect/include/wfd_ug.h2
-rwxr-xr-xug-wifidirect/include/wfd_ug_view.h2
-rwxr-xr-xug-wifidirect/src/wfd_client.c2
-rwxr-xr-xug-wifidirect/src/wfd_ug.c2
-rwxr-xr-xug-wifidirect/src/wfd_ug_about_view.c2
-rwxr-xr-xug-wifidirect/src/wfd_ug_genlist.c2
-rwxr-xr-xug-wifidirect/src/wfd_ug_main_view.c2
-rwxr-xr-xug-wifidirect/src/wfd_ug_multiconnect_view.c2
-rwxr-xr-xug-wifidirect/src/wfd_ug_popup.c2
-rwxr-xr-xugapp-wifidirect/include/wfd-ugapp-util.h2
-rwxr-xr-xugapp-wifidirect/include/wfd-ugapp.h2
-rwxr-xr-xugapp-wifidirect/src/wfd-ugapp-main.c2
-rw-r--r--ugapp-wifidirect/src/wfd-ugapp-util.c2
21 files changed, 21 insertions, 21 deletions
diff --git a/popup-wifidirect/include/wfd-app-strings.h b/popup-wifidirect/include/wfd-app-strings.h
index 8748253..1110cc5 100755
--- a/popup-wifidirect/include/wfd-app-strings.h
+++ b/popup-wifidirect/include/wfd-app-strings.h
@@ -7,7 +7,7 @@
* 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/popup-wifidirect/include/wfd-app-util.h b/popup-wifidirect/include/wfd-app-util.h
index e2f6d2f..07a1584 100755
--- a/popup-wifidirect/include/wfd-app-util.h
+++ b/popup-wifidirect/include/wfd-app-util.h
@@ -7,7 +7,7 @@
* 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/popup-wifidirect/include/wfd-app.h b/popup-wifidirect/include/wfd-app.h
index 6aa9338..486f30f 100755
--- a/popup-wifidirect/include/wfd-app.h
+++ b/popup-wifidirect/include/wfd-app.h
@@ -7,7 +7,7 @@
* 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/popup-wifidirect/src/wfd-app-client.c b/popup-wifidirect/src/wfd-app-client.c
index d59b00c..94803f6 100755
--- a/popup-wifidirect/src/wfd-app-client.c
+++ b/popup-wifidirect/src/wfd-app-client.c
@@ -7,7 +7,7 @@
* 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/popup-wifidirect/src/wfd-app-main.c b/popup-wifidirect/src/wfd-app-main.c
index 7d84f44..c35171c 100755
--- a/popup-wifidirect/src/wfd-app-main.c
+++ b/popup-wifidirect/src/wfd-app-main.c
@@ -7,7 +7,7 @@
* 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/popup-wifidirect/src/wfd-app-popup-view.c b/popup-wifidirect/src/wfd-app-popup-view.c
index 14ec90b..a80528e 100755
--- a/popup-wifidirect/src/wfd-app-popup-view.c
+++ b/popup-wifidirect/src/wfd-app-popup-view.c
@@ -7,7 +7,7 @@
* 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/popup-wifidirect/src/wfd-app-util.c b/popup-wifidirect/src/wfd-app-util.c
index 8efb237..406b3f3 100644
--- a/popup-wifidirect/src/wfd-app-util.c
+++ b/popup-wifidirect/src/wfd-app-util.c
@@ -7,7 +7,7 @@
* 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/ug-wifidirect/include/wfd_client.h b/ug-wifidirect/include/wfd_client.h
index 067fb08..a393081 100644
--- a/ug-wifidirect/include/wfd_client.h
+++ b/ug-wifidirect/include/wfd_client.h
@@ -7,7 +7,7 @@
* 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/ug-wifidirect/include/wfd_ug.h b/ug-wifidirect/include/wfd_ug.h
index ff16f49..1edc7dc 100755
--- a/ug-wifidirect/include/wfd_ug.h
+++ b/ug-wifidirect/include/wfd_ug.h
@@ -7,7 +7,7 @@
* 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/ug-wifidirect/include/wfd_ug_view.h b/ug-wifidirect/include/wfd_ug_view.h
index 7a6359b..17b87c9 100755
--- a/ug-wifidirect/include/wfd_ug_view.h
+++ b/ug-wifidirect/include/wfd_ug_view.h
@@ -7,7 +7,7 @@
* 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/ug-wifidirect/src/wfd_client.c b/ug-wifidirect/src/wfd_client.c
index 60092bb..f1f1e93 100755
--- a/ug-wifidirect/src/wfd_client.c
+++ b/ug-wifidirect/src/wfd_client.c
@@ -7,7 +7,7 @@
* 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/ug-wifidirect/src/wfd_ug.c b/ug-wifidirect/src/wfd_ug.c
index 18dcb67..4eaeb80 100755
--- a/ug-wifidirect/src/wfd_ug.c
+++ b/ug-wifidirect/src/wfd_ug.c
@@ -7,7 +7,7 @@
* 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/ug-wifidirect/src/wfd_ug_about_view.c b/ug-wifidirect/src/wfd_ug_about_view.c
index 44774b9..a2d7934 100755
--- a/ug-wifidirect/src/wfd_ug_about_view.c
+++ b/ug-wifidirect/src/wfd_ug_about_view.c
@@ -7,7 +7,7 @@
* 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/ug-wifidirect/src/wfd_ug_genlist.c b/ug-wifidirect/src/wfd_ug_genlist.c
index 35d4103..64474ce 100755
--- a/ug-wifidirect/src/wfd_ug_genlist.c
+++ b/ug-wifidirect/src/wfd_ug_genlist.c
@@ -7,7 +7,7 @@
* 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/ug-wifidirect/src/wfd_ug_main_view.c b/ug-wifidirect/src/wfd_ug_main_view.c
index 62c6988..1e9fba3 100755
--- a/ug-wifidirect/src/wfd_ug_main_view.c
+++ b/ug-wifidirect/src/wfd_ug_main_view.c
@@ -7,7 +7,7 @@
* 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/ug-wifidirect/src/wfd_ug_multiconnect_view.c b/ug-wifidirect/src/wfd_ug_multiconnect_view.c
index 480668c..b5cccc3 100755
--- a/ug-wifidirect/src/wfd_ug_multiconnect_view.c
+++ b/ug-wifidirect/src/wfd_ug_multiconnect_view.c
@@ -7,7 +7,7 @@
* 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/ug-wifidirect/src/wfd_ug_popup.c b/ug-wifidirect/src/wfd_ug_popup.c
index b7778b3..6959ee2 100755
--- a/ug-wifidirect/src/wfd_ug_popup.c
+++ b/ug-wifidirect/src/wfd_ug_popup.c
@@ -7,7 +7,7 @@
* 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/ugapp-wifidirect/include/wfd-ugapp-util.h b/ugapp-wifidirect/include/wfd-ugapp-util.h
index 7139e9a..f13a845 100755
--- a/ugapp-wifidirect/include/wfd-ugapp-util.h
+++ b/ugapp-wifidirect/include/wfd-ugapp-util.h
@@ -7,7 +7,7 @@
* 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/ugapp-wifidirect/include/wfd-ugapp.h b/ugapp-wifidirect/include/wfd-ugapp.h
index 61b7b31..7939ec2 100755
--- a/ugapp-wifidirect/include/wfd-ugapp.h
+++ b/ugapp-wifidirect/include/wfd-ugapp.h
@@ -7,7 +7,7 @@
* 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/ugapp-wifidirect/src/wfd-ugapp-main.c b/ugapp-wifidirect/src/wfd-ugapp-main.c
index c9f0b1e..55b1a8e 100755
--- a/ugapp-wifidirect/src/wfd-ugapp-main.c
+++ b/ugapp-wifidirect/src/wfd-ugapp-main.c
@@ -7,7 +7,7 @@
* 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/ugapp-wifidirect/src/wfd-ugapp-util.c b/ugapp-wifidirect/src/wfd-ugapp-util.c
index 7cf7310..a990141 100644
--- a/ugapp-wifidirect/src/wfd-ugapp-util.c
+++ b/ugapp-wifidirect/src/wfd-ugapp-util.c
@@ -7,7 +7,7 @@
* 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,