summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjihye424.kim <jihye424.kim@samsung.com>2017-09-14 11:16:22 +0900
committerjihye424.kim <jihye424.kim@samsung.com>2017-09-14 11:16:22 +0900
commit090cadb620aa0b8522de2d8d144db656c1a26e11 (patch)
treef3428dc0da665ac8de88000a9162ba1dda5bf22b
parent2d29875142db3d4045451bd190c908ed53677276 (diff)
parentf6e3d4c5e48784e1822c6c28235c393248fe9610 (diff)
downloademulator-manager-resources-090cadb620aa0b8522de2d8d144db656c1a26e11.tar.gz
emulator-manager-resources-090cadb620aa0b8522de2d8d144db656c1a26e11.tar.bz2
emulator-manager-resources-090cadb620aa0b8522de2d8d144db656c1a26e11.zip
Merge branch 'develop_p4.0' into tizen_studio_2.0_p4.0
-rw-r--r--package/changelog5
-rw-r--r--package/pkginfo.manifest14
2 files changed, 12 insertions, 7 deletions
diff --git a/package/changelog b/package/changelog
index a9890e8..87159dc 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,8 @@
+* 2.5.14
+- add 'emulator-resources' to install dependency
+- change build os to ubuntu 64
+== jiyhe kim<jihye424.kim@samsung.com> 2017-08-10
+
* 2.5.13
- change default ram size to 1024
== minkee Lee<minkee.lee@samsung.com> 2017-07-29
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 61eb607..64f1358 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,24 +1,24 @@
Source: emulator-manager-resources
-Version: 2.5.13
+Version: 2.5.14
Maintainer: MinKee Lee <minkee.lee@samsung.com>, Jihye Kim <jihye424.kim@samsung.com>
Package: mobile-4.0-emulator-manager-resources
OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
-Build-host-os: ubuntu-32
+Build-host-os: ubuntu-64
Build-dependency: emulator-manager
-Install-dependency: mobile-4.0-emulator-qemu-skins
+Install-dependency: mobile-emulator-resources
Description: Emulator Manager Platform Resources
Package: wearable-4.0-emulator-manager-resources
OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
-Build-host-os: ubuntu-32
+Build-host-os: ubuntu-64
Build-dependency: emulator-manager
-Install-dependency: wearable-4.0-emulator-qemu-skins
+Install-dependency: wearable-emulator-resources
Description: Emulator Manager Platform Resources
Package: tv-4.0-emulator-manager-resources
OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
-Build-host-os: ubuntu-32
+Build-host-os: ubuntu-64
Build-dependency: emulator-manager
-Install-dependency: tv-4.0-emulator-qemu-skins
+Install-dependency: tv-emulator-resources
Description: Emulator Manager Platform Resources