Merge branch 'develop' into release

Conflicts:
	package/changelog
	package/pkginfo.manifest

diff --cc package/changelog
index 4f90630,e63de93..5f02c34
--- 1/package/changelog
--- 2/package/changelog
+++ b/package/changelog
@@@ -1,40 -1,39 +1,47 @@@
 -* 1.0.29
 -- Added property tab for GBS Options
 -- Removed Sample tab from project wizard
 -- Added build config action set
 -- Check to exist GBS tool
++* 1.0.32
++- Merge branch "develop" into release
++- [develop] Added property tab for GBS Options
++- [develop] emoved Sample tab from project wizard
++- [develop] Added build config action set
++- [develop] Check to exist GBS tool
+ == donghyuk.yang <donghyuk.yang@samsung.com> 2012-12-17
 -* 1.0.28
 +* 1.0.31
  - Removed launch menu of Package Manager
  == donghyuk.yang <donghyuk.yang@samsung.com> 2012-12-05
 -* 1.0.27
 -- Removed macos 
 +* 1.0.30
 +- Removed macos-64 from supported OS
  == donghee yang <donghee.yang@samsung.com> 2012-11-28
 +* 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
  * 1.0.26
 +- Rollback status of package manager before latest merging
  - Fixed a bug for setting rootstrap path to xml file when modify rootstrap
 -== donghyuk.yang <donghyuk.yang@samsung.com> 2012-11-27
 +== donghyuk.yang <donghyuk.yang@samsung.com> 2012-11-03
  * 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
 +- Merged latest changes
 +- [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

diff --cc package/pkginfo.manifest
index fbbbaa1,ca7f097..6df156b
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,4 -1,4 +1,4 @@@
- Version:1.0.31
 -Version:1.0.29
++Version:1.0.32
  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>