From: Kitae Kim <kt920.kim@samsung.com>
Date: Fri, 17 Feb 2012 08:29:38 +0000 (+0900)
Subject: Merge branch 'develop' of newgit:sdk/emulator/emulator-kernel into develop
X-Git-Tag: 2.2.1_release^2~171
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b57732e38aec1509f80612feed1409580b32cc17;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'develop' of newgit:sdk/emulator/emulator-kernel into develop

Conflicts:
	package/pkginfo.manifest
---

b57732e38aec1509f80612feed1409580b32cc17
diff --cc package/pkginfo.manifest
index 278f141cd2d4,e457876b5b9a..315ceeeffcda
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,5 -1,5 +1,9 @@@
  Package: emulator-kernel
++<<<<<<< HEAD
 +Version: 1.1.3
++=======
+ Version: 1.1.2
++>>>>>>> 948357da2b9653867fcb8bc18a482fa95d5a577c
  OS: linux
  Build-host-os: linux
  Maintainer: Yeong-Kyoon, Lee <yeongkyoon.lee@samsung.com>
@@@ -7,7 -7,7 +11,11 @@@ Source: emulator-kerne
  Description: Tizen Emulator Kernel
  
  Package: emulator-kernel
++<<<<<<< HEAD
 +Version: 1.1.3
++=======
+ Version: 1.1.2
++>>>>>>> 948357da2b9653867fcb8bc18a482fa95d5a577c
  OS: windows
  Build-host-os: linux
  Maintainer: Yeong-Kyoon, Lee <yeongkyoon.lee@samsung.com>