projects / sdk / ide / nativeplatform-eplugin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 85835d9)
Modified license file name
authorkh5325.kim <kh5325.kim@samsung.com>
Wed, 17 Jul 2013 13:48:21 +0000 (22:48 +0900)
committerkh5325.kim <kh5325.kim@samsung.com>
Wed, 17 Jul 2013 13:48:21 +0000 (22:48 +0900)
org.tizen.nativeplatform.feature/Apache-v2.0.html [moved from org.tizen.nativeplatform.feature/LICENSE-2.0.htm with 100% similarity] patch | blob | history
org.tizen.nativeplatform.feature/build.properties patch | blob | history
org.tizen.nativeplatform.feature/feature.xml patch | blob | history
org.tizen.nativeplatform.feature/license.html [deleted file] patch | blob | history

diff --git a/org.tizen.nativeplatform.feature/build.properties b/org.tizen.nativeplatform.feature/build.properties
index ab46e7f..89e20e8 100644 (file)
--- a/org.tizen.nativeplatform.feature/build.properties
+++ b/org.tizen.nativeplatform.feature/build.properties
@@ -1,5 +1,4 @@
 bin.includes = feature.xml,\
-               LICENSE-2.0.htm,\
-               license.html
+               Apache-v2.0.html
 root = rootfiles
                
\ No newline at end of file
diff --git a/org.tizen.nativeplatform.feature/feature.xml b/org.tizen.nativeplatform.feature/feature.xml
index 1c2ed1a..72ab0af 100644 (file)
--- a/org.tizen.nativeplatform.feature/feature.xml
+++ b/org.tizen.nativeplatform.feature/feature.xml
@@ -12,13 +12,9 @@
    </description>
 
    <copyright>
-      Copyright (c)
+      Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved.
    </copyright>
 
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
    <includes
          id="org.tizen.nativeappcommon.feature"
          version="0.0.0"/>
diff --git a/org.tizen.nativeplatform.feature/license.html b/org.tizen.nativeplatform.feature/license.html
deleted file mode 100644 (file)
index 03d90e2..0000000
--- a/org.tizen.nativeplatform.feature/license.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Tizen SOFTWARE DEVELOPMENT KIT (&quot;SDK&quot;) LICENSE AGREEMENT</title>
-</head>
-
-<body lang="EN-US">
-<p align="center">Tizen SDK</p><br /><br />
-
-Tizen SDK contains software portions licensed under various open source licenses as well as proprietary components.  All open source software portions (“Open Source Software”) are licensed under the open source licenses that accompany such Open Source Software.<br /><br />
-
-The licenses governing the Open Source Software are available at: <a href="http://developer.tizen.org/download/tizen_sdk_opensource_license.html">http://developer.tizen.org/download/tizen_sdk_opensource_license.html</a><br /><br />
- 
-Except for the Open Source Software contained in Tizen SDK, all other software portions contained in Tizen SDK are governed by the terms and conditions of the Tizen Software Development Kit License Agreement, available at: <a href="http://developer.tizen.org/download/samsung_sdk_license.html">http://developer.tizen.org/download/samsung_sdk_license.html</a><br /><br />
-
-You may access and download Tizen SDK Open Source Software at: <a href="http://developer.tizen.org/download/tizenopensdk.tar.gz">http://developer.tizen.org/download/tizenopensdk.tar.gz</a><br /><br />
-
-BY CLICKING THE "I AGREE" BUTTON OR BY USING ANY PART OF TIZEN SDK, YOU AGREE (ON BEHALF OF YOURSELF AND/OR YOUR COMPANY) TO THE OPEN SOURCE SOFTWARE LICENSE TERMS AND THE TIZEN SOFTWARE DEVELOPMENT KIT LICENSE AGREEMENT. IF YOU DO NOT AGREE WITH THE OPEN SOURCE SOFTWARE LICENSE TERMS OR THE TIZEN SOFTWARE DEVELOPMENT KIT LICENSE AGREEMENT, YOU MAY NOT DOWNLOAD OR USE TIZEN SDK.<br /><br />
-</body>
-</html>
Domain: SDK / Native IDE;