From: Bon-Yong Lee <bonyong.lee@samsung.com>
Date: Mon, 23 Jul 2012 01:35:42 +0000 (+0900)
Subject: Merge branch 'develop' into internal_release
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=20096d2a1a3753db3f62ce9793e6e23fd051b7b2;p=sdk%2Ftools%2Fcli.git

Merge branch 'develop' into internal_release

Conflicts:
	org.tizen.cli/doc/install/bin/sign
	org.tizen.cli/doc/install/bin/wgt
	org.tizen.cli/doc/install/bin_/sign
	org.tizen.cli/doc/install/bin_/web-packaging
	org.tizen.cli/doc/install/bin_/web-signing
	org.tizen.cli/doc/install/bin_/wgt
	package/pkginfo.manifest
---

20096d2a1a3753db3f62ce9793e6e23fd051b7b2
diff --cc package/pkginfo.manifest
index 3b34b8e,3f958fb..2d5baf0
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,17 -1,33 +1,53 @@@
++<<<<<<< HEAD
 +Package: web-cli
 +Version:1.0.1
 +OS: linux
 +Build-host-os: linux
 +Maintainer: Bon-Yong Lee<bonyong.lee@samsung.com>
 +Build-dependency: webapp-eplugin [linux]
 +Source: emulator-manager
 +Description: Tizen IDE Command Line Interface
 +
 +Package: web-cli
 +Version:1.0.1
 +OS: windows
 +Build-host-os: linux
 +Maintainer: Bon-Yong Lee<bonyong.lee@samsung.com>
 +Build-dependency: webapp-eplugin [windows]
 +Source: emulator-manager
 +Description: Tizen IDE Command Line Interface
++=======
+ version:1.0.5
+ Maintainer: Bon-Yong Lee<bonyong.lee@samsung.com>
+ 
+ Package: web-cli
+ OS: ubuntu-32
+ Build-host-os: ubuntu-32
+ Build-dependency: webapp-eplugin [ubuntu-32], base-ide-product [ubuntu-32], common-eplugin [ubuntu-32]
+ Description: Tizen IDE Command Line Interface
+ 
+ Package: web-cli
+ OS: ubuntu-64
+ Build-host-os: ubuntu-32
+ Build-dependency: webapp-eplugin [ubuntu-64], base-ide-product [ubuntu-64], common-eplugin [ubuntu-64]
+ Description: Tizen IDE Command Line Interface
+ 
+ Package: web-cli
+ OS: windows-32
+ Build-host-os: ubuntu-32
+ Build-dependency: webapp-eplugin [windows-32], base-ide-product [windows-32], common-eplugin [windows-32]
+ Description: Tizen IDE Command Line Interface
+ 
+ Package: web-cli
+ OS: windows-64
+ Build-host-os: ubuntu-32
+ Build-dependency: webapp-eplugin [windows-64], base-ide-product [windows-64], common-eplugin [windows-64]
+ Description: Tizen IDE Command Line Interface
+ 
+ Package: web-cli
+ OS: macos-64
+ Build-host-os: ubuntu-32
+ Build-dependency: webapp-eplugin [macos-64], base-ide-product [macos-64], common-eplugin [macos-64]
+ Description: Tizen IDE Command Line Interface
+ 
++>>>>>>> develop