diff options
author | jihye424.kim <jihye424.kim@samsung.com> | 2016-08-19 12:04:17 +0900 |
---|---|---|
committer | jihye424.kim <jihye424.kim@samsung.com> | 2016-08-19 12:04:26 +0900 |
commit | 3582c5cedb72df00b3e7f65ec8b4a8b88a47ccce (patch) | |
tree | 5778ae73afc3e075fe1f15c239f34950e1d86348 | |
parent | 655e3006f6057f9dc1b4808e7f3a1328d54e2da2 (diff) | |
parent | c8ff603e14186c16d99e644bf17911a37f86c96c (diff) | |
download | qemu-3582c5cedb72df00b3e7f65ec8b4a8b88a47ccce.tar.gz qemu-3582c5cedb72df00b3e7f65ec8b4a8b88a47ccce.tar.bz2 qemu-3582c5cedb72df00b3e7f65ec8b4a8b88a47ccce.zip |
Merge branch 'develop_2.3.1' into platform_2.3.1
Change-Id: I3bf264e6df748442cf340a8ac5dff294a13495e8
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>
-rw-r--r-- | package/changelog | 3 | ||||
-rw-r--r-- | package/pkginfo.manifest | 2 | ||||
-rw-r--r-- | tizen/src/skin/client/resource/icons/emulator_icon.ico | bin | 67646 -> 67646 bytes | |||
-rw-r--r-- | tizen/src/skin/client/resource/icons/emulator_icon.png | bin | 6474 -> 6876 bytes |
4 files changed, 4 insertions, 1 deletions
diff --git a/package/changelog b/package/changelog index b4dcf9263e..4083f4eccc 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,6 @@ +* 2.1.42 +- change emulator icon +== jihye kim <jihye424.kim@samsung.com> 2016-08-19 * 2.1.41 - update libraries == SeokYeon Hwang <syeon.hwang@samsung.com> 2016-07-04 diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 074fedcfba..d84cfde1b5 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,4 +1,4 @@ -Version: 2.1.41 +Version: 2.1.42 Maintainer: Sangho Park <sangho1206.park@samsung.com> Source: emulator diff --git a/tizen/src/skin/client/resource/icons/emulator_icon.ico b/tizen/src/skin/client/resource/icons/emulator_icon.ico Binary files differindex a170e86812..3d303ab1fd 100644 --- a/tizen/src/skin/client/resource/icons/emulator_icon.ico +++ b/tizen/src/skin/client/resource/icons/emulator_icon.ico diff --git a/tizen/src/skin/client/resource/icons/emulator_icon.png b/tizen/src/skin/client/resource/icons/emulator_icon.png Binary files differindex 62538e9d51..000563dfe5 100644 --- a/tizen/src/skin/client/resource/icons/emulator_icon.png +++ b/tizen/src/skin/client/resource/icons/emulator_icon.png |