[Title] fixed wrong merge

[Desc.]
[Issue]

Change-Id: Ieca8795d5e951fea7f645a4ff402de338297e6f5

diff --git a/package/changelog b/package/changelog
index 0a76ef9..09811f9 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -108,87 +108,10 @@
 - Restored RDS's installation directory and RDS's installation command.
 == gune.kim <gune.kim@samsung.com> 2013-04-04 20:59
 * 2.1.13
-=======
-* 2.1.35
-- Fixed tizen-web-ui-fw dependency
-== gyeongseok.seo <gyeongseok.seo@samsung.com> 2013-05-28
-* 2.1.34
-- Fix bug to miss last line in device's response
-== bonyong.lee <bonyong.lee@samsung.com> 2013-05-23
-* 2.1.33
-- Restore ordered lock
-== kh5325.kim <kh5325.kim@samsung.com> 2013-05-23
-* 2.1.32
-- Refactored to sdblib
-== kh5325.kim <kh5325.kim@samsung.com> 2013-05-23
-* 2.1.31
-- Refactored to sdblib
-== kh5325.kim <kh5325.kim@samsung.com> 2013-05-23
-* 2.1.30
-- Refactored to sdblib
-== kh5325.kim <kh5325.kim@samsung.com> 2013-05-23
-* 2.1.29
-- Refactored to sdblib
-== kh5325.kim <kh5325.kim@samsung.com> 2013-05-22
-* 2.1.28
-- Removed IProjectInfo (deprecated by ITizenProject)
-== kh5325.kim <kh5325.kim@samsung.com> 2013-05-17
-* 2.1.27
-- The smart launch moved to common-eplugin
-== hyunsik.noh <hyunsik.noh@samsung.com> 2013-05-16 19:16
-* 2.1.26
-- Update mask.png
-== changhyun1.lee <changhyun1.lee@samsung.com> 2013-05-15 17:04
-* 2.1.25
-- Removed unused import
-== kh5325.kim <kh5325.kim@samsung.com> 2013-05-10
-* 2.1.24
-- updated tizen web ui fw to 0.2.29
-== jihoon80.song <jihoon80.song@samsung.com> 2013-05-10 18:57
-* 2.1.23
-- fixed NCDFE for CipherUtil
-== jihoon80.song <jihoon80.song@samsung.com> 2013-04-30 11:15
-* 2.1.22
-- updated web ui fw to 0.2.26
-== jihoon80.song <jihoon80.song@samsung.com> 2013-04-29 13:35
-* 2.1.21
-- Merged the latest changes
-== kh5325.kim <kh5325.kim@samsung.com> 2013-04-25
-* 2.1.20
-- add build framework.
-== taeyoung2.son <taeyoung2.son@samsung.com> 2013-04-24 18:59
-* 2.1.19
-- updated Tizen Web UI FW to 0.2.25
-== jihoon80.song <jihoon80.song@samsung.com> 2013-04-19 20:35
-* 2.1.18
-- Merged the latest changes
-== kh5325.kim <kh5325.kim@samsung.com> 2013-04-19
-* 2.1.17
-- Update icon.png
-== changhyun1.lee <changhyun1.lee@samsung.com> 2013-04-15 13:40
-* 2.1.16
-- Added Tizen IDE shortcuts pdf file and menu
-== shingil.kang <shingil.kang@samsung.com> 2013-04-10
-* 2.1.15
-- Fixed template attribute (data-inline)
-== changhyun1.lee <changhyun1.lee@samsung.com> 2013-04-07 20:34
-* 2.1.14
-- Fix command to check device type
-- Fixed to use /usr/bin/dlogutil
-== kh5325.kim <kh5325.kim@samsung.com> 2013-04-05
-* 2.1.13
-- support root command
-== yoonki.park <yoonki.park@samsung.com> 2013-04-05 11:26
-* 2.1.12
-- updated tizen web ui fw to 0.2.21
-== jihoon80.song <jihoon80.song@samsung.com> 2013-04-04 15:02
-* 2.1.11
->>>>>>> develop
 - Changed the default required version in config.xml's tizen:application tag attribute
 - Fixed NPE about the removeFile method in EclipseFileHandler
 - Fixed HashSigner bugs
 == jihoon80.song <jihoon80.song@samsung.com> 2013-04-03
-<<<<<<< HEAD
 * 2.1.12
 - Added context help ids and HelpToolTip
 == donghyuk yang <donghyuk.yang@samsung.com> 2013-04-02
@@ -259,79 +182,6 @@
 * 2.0.10
 - Merge the latest changes
 == ho.namkoong <ho.namkoong@samsung.com> 2013-02-18
-=======
-* 2.1.10
-- fixed native incremental sign problems
-== jihoon80.song <jihoon80.song@samsung.com> 2013-04-02 14:55
-* 2.1.9
-- updated web ui fw to 0.2.20
-- add executable shell command method for prompt mode change dlogutil path
-- Absolute path for pkgcmd and launch_app
-== kh5325.kim <kh5325.kim@samsung.com> 2013-03-30
-* 2.1.8
-- InstallPathConfig folder: tizen2.0 -> tizen2.1
-== kh5325.kim <kh5325.kim@samsung.com> 2013-03-27
-* 2.1.7
-- Merged the latest changes
-== kh5325.kim <kh5325.kim@samsung.com> 2013-03-24
-* 2.1.6
-- Update WIDL
-== changhyun1.lee <changhyun1.lee@samsung.com> 2013-03-22 11:30
-* 2.1.5
-- Merged the latest changes
-== kh5325.kim <kh5325.kim@samsung.com> 2013-03-20
-* 2.1.4
-- Added AppTrayIcon Feature
-== changhyun1.lee <changhyun1.lee@samsung.com> 2013-03-16 17:36
-* 2.1.3
-- Merged the latest changes
-== kh5325.kim <kh5325.kim@samsung.com> 2013-03-15
-* 2.1.2
-- singleton:=true
-== kh5325.kim <kh5325.kim@samsung.com> 2013-03-13
-* 2.1.1
-- support coredump debugging
-== kh5325.kim <kh5325.kim@samsung.com> 2013-03-12
-* 2.1.0
-- 2.1.0 Package
-== kh5325.kim <kh5325.kim@samsung.com> 2013-03-08
-* 2.0.21
-- Fixed CoreException in propertyPages
-== changhyun1.lee <changhyun1.lee@samsung.com> 2013-03-07 19:25
-* 2.0.20
-- added SdbCommand & pkgcmd's exitcode checker
-== gune.kim <gune.kim@samsung.com> 2013-03-07 11:39
-* 2.0.19
-- Added Licence infomation
-== changhyun1.lee <changhyun1.lee@samsung.com> 2013-03-01 19:02
-* 2.0.18
-- Added SWTUtil
-== changhyun1.lee <changhyun1.lee@samsung.com> 2013-02-26 16:53
-* 2.0.17
-- Merged the latest changes
-== kh5325.kim <kh5325.kim@samsung.com> 2013-02-22
-* 2.0.16
-- Merged the latest changes
-== kh5325.kim <kh5325.kim@samsung.com> 2013-02-20
-* 2.0.15
-- Fixed CLI application id, package attribute
-== changhyun1.lee <changhyun1.lee@samsung.com> 2013-02-19 19:48
-* 2.0.14
-- Fix bug when check result about changing platform
-== hyunsik.noh <hyunsik.noh@samsung.com> 2013-02-19 11:32
-* 2.0.13
-- Rollback to selecting device by connection explorer
-== hyunsik.noh <hyunsik.noh@samsung.com> 2013-02-15 17:42
-* 2.0.12
-- Fixed ID Validation
-== changhyun1.lee <changhyun1.lee@samsung.com> 2013-02-14 10:52
-* 2.0.11
-- In the case of RDS, the partial directories's permision was changed to "app:app".
-== gune.kim <gune.kim@samsung.com> 2013-02-08 10:17
-* 2.0.10
-- Merged the latest changes
-== kh5325.kim <kh5325.kim@samsung.com> 2013-01-28
->>>>>>> develop
 * 2.0.9
 - Fixed ID Validation
 == changhyun1.lee <changhyun1.lee@samsung.com> 2013-02-14 10:52