[Title] Merged changelog and pkginfo.manifest

diff --git a/package/changelog b/package/changelog
index 670ea46..8554c7e 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,4 +1,6 @@
-<<<<<<< HEAD
+* 1.0.28
+- Merge branch "develop" into release
+== donghyuk.yang <donghyuk.yang@samsung.com> 2012-11-26
 * 1.0.27
 - Hide preference page for git config and added filter for proxy port
 == donghyuk.yang <donghyuk.yang@samsung.com> 2012-11-03
@@ -7,33 +9,25 @@
 == donghyuk.yang <donghyuk.yang@samsung.com> 2012-11-03
 * 1.0.25
 - Merged latest changes
-== kh5325.kim <kh5325.kim@samsung.com> 2012-11-02
-* 1.0.24
-- Added dis upgrade feature to package manager
-== donghyuk.yang <donghyuk.yang@samsung.com> 2011-10-23
-=======
-* 1.0.25
-- Fixed a bug that project from git is not working when using schema in
-base uri
-- Check a mismatch architecture between rootstrap and configuration when
-selecting rootstrap
-- Changed base directory of user rootstraps to "~/tizen-sdk-data"
-- Removed double quotation marks from wizard title and description
+- [develop] Fixed a bug that project from git is not working when using schema in base uri
+- [develop] Check a mismatch architecture between rootstrap and configuration when selecting rootstrap
+- [develop] Changed base directory of user rootstraps to "~/tizen-sdk-data"
+- [develop] Removed double quotation marks from wizard title and description
 = donghyuk.yang <donghyuk.yang@samsung.com> 2012-11-23
 * 1.0.24
-- Modified method for passing environment variables to command launcher
+- Added dis upgrade feature to package manager
+- [develop] Modified method for passing environment variables to command launcher
 == donghyuk.yang <donghyuk.yang@samsung.com> 2012-11-22
 * 1.0.23
-- Added question dialog if rootstrap is not initialized
-- Do not pass rootstrap name and arch arguments to sbi action script
+- [develop] Added question dialog if rootstrap is not initialized
+- [develop] Do not pass rootstrap name and arch arguments to sbi action script
 == donghyuk.yang <donghyuk.yang@samsung.com> 2012-11-21
 * 1.0.22
-- Release for test
+- [develop] Release for test
 == donghee.yang <donghee.yang@samsung.com> 2012-11-21
 * 1.0.21
-- Applied new Platfrom SDK concept
+- [develop] Applied new Platfrom SDK concept
 == ho.namkoong <ho.namkoong@samsung.com> 2012-11-15 15:39
 * 1.0.20
-- Create fundamental folder when creating native project
+- [develop] Create fundamental folder when creating native project
 == ho.namkoong <ho.namkoong@samsung.com> 2012-11-15 15:39
->>>>>>> develop

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 55acd7a..a5dc2a6 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-Version:1.0.27
-=======
-Version:1.0.25
->>>>>>> develop
+Version:1.0.28
 Source:nativeplatform-eplugin
 Maintainer:Kangho Kim <kh5325.kim@samsung.com>, Yoonki Park<yoonki.park@samsung.com>, Hyunsik Noh<hyunsik.noh@samsung.com>, Gun Kim<gune.kim@samsung.com>, Ho Namkoong<ho.namkoong@samsung.com>, Taeyoung Son<taeyoung2.son@samsung.com>