diff options
| author | Sangho Park <sangho1206.park@samsung.com> | 2015-04-16 20:08:02 +0900 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@tizensrc> | 2015-04-16 20:08:02 +0900 |
| commit | 023af422c86f0bf18deee7d3ea8dc7990a5cd5f1 (patch) | |
| tree | 3a7dde83ebdc63e3c6471b835d335e36ef8e12fe | |
| parent | 56a6513d92704de70885f3e83f7d98075fb5d321 (diff) | |
| parent | 0dcbe4d8e39ca47470e80f786f9634b53dc66f51 (diff) | |
| download | qemu-023af422c86f0bf18deee7d3ea8dc7990a5cd5f1.tar.gz qemu-023af422c86f0bf18deee7d3ea8dc7990a5cd5f1.tar.bz2 qemu-023af422c86f0bf18deee7d3ea8dc7990a5cd5f1.zip | |
Merge "skin: install wearable-360x360 square skin" into tizen_2.3.1
| -rwxr-xr-x | package/build.macos-64 | 1 | ||||
| -rwxr-xr-x | package/build.ubuntu-32 | 1 | ||||
| -rwxr-xr-x | package/build.ubuntu-64 | 1 | ||||
| -rwxr-xr-x | package/build.windows-32 | 1 | ||||
| -rw-r--r-- | tizen/src/skin/client/skins/wearable-360x360-1btn/info.ini | 2 | ||||
| -rw-r--r-- | tizen/src/skin/client/skins/wearableO-360x360-1btn/info.ini | 2 |
6 files changed, 6 insertions, 2 deletions
diff --git a/package/build.macos-64 b/package/build.macos-64 index d1efdd7ba2..bed1fa615c 100755 --- a/package/build.macos-64 +++ b/package/build.macos-64 @@ -130,6 +130,7 @@ install() cp -pPR src/skin/client/skins/mobile-720x1280-3btn $MOBILE_2_3_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/wearable-general-1btn $WEARABLE_2_3_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/wearable-320x320-1btn $WEARABLE_2_3_SKIN_RESOURCE_DIR/ + cp -pPR src/skin/client/skins/wearable-360x360-1btn $WEARABLE_2_3_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/wearableO-360x360-1btn $WEARABLE_2_3_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/wearable-360x480-1btn $WEARABLE_2_3_SKIN_RESOURCE_DIR/ } diff --git a/package/build.ubuntu-32 b/package/build.ubuntu-32 index 2de505bb67..5d3417cd79 100755 --- a/package/build.ubuntu-32 +++ b/package/build.ubuntu-32 @@ -90,6 +90,7 @@ install() cp -pPR src/skin/client/skins/mobile-720x1280-3btn $MOBILE_2_3_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/wearable-general-1btn $WEARABLE_2_3_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/wearable-320x320-1btn $WEARABLE_2_3_SKIN_RESOURCE_DIR/ + cp -pPR src/skin/client/skins/wearable-360x360-1btn $WEARABLE_2_3_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/wearableO-360x360-1btn $WEARABLE_2_3_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/wearable-360x480-1btn $WEARABLE_2_3_SKIN_RESOURCE_DIR/ } diff --git a/package/build.ubuntu-64 b/package/build.ubuntu-64 index 2de505bb67..5d3417cd79 100755 --- a/package/build.ubuntu-64 +++ b/package/build.ubuntu-64 @@ -90,6 +90,7 @@ install() cp -pPR src/skin/client/skins/mobile-720x1280-3btn $MOBILE_2_3_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/wearable-general-1btn $WEARABLE_2_3_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/wearable-320x320-1btn $WEARABLE_2_3_SKIN_RESOURCE_DIR/ + cp -pPR src/skin/client/skins/wearable-360x360-1btn $WEARABLE_2_3_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/wearableO-360x360-1btn $WEARABLE_2_3_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/wearable-360x480-1btn $WEARABLE_2_3_SKIN_RESOURCE_DIR/ } diff --git a/package/build.windows-32 b/package/build.windows-32 index 5370c9ac4b..ad00616673 100755 --- a/package/build.windows-32 +++ b/package/build.windows-32 @@ -97,6 +97,7 @@ install() cp -pPR src/skin/client/skins/mobile-720x1280-3btn $MOBILE_2_3_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/wearable-general-1btn $WEARABLE_2_3_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/wearable-320x320-1btn $WEARABLE_2_3_SKIN_RESOURCE_DIR/ + cp -pPR src/skin/client/skins/wearable-360x360-1btn $WEARABLE_2_3_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/wearableO-360x360-1btn $WEARABLE_2_3_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/wearable-360x480-1btn $WEARABLE_2_3_SKIN_RESOURCE_DIR/ } diff --git a/tizen/src/skin/client/skins/wearable-360x360-1btn/info.ini b/tizen/src/skin/client/skins/wearable-360x360-1btn/info.ini index de92824e7e..363ef9cb81 100644 --- a/tizen/src/skin/client/skins/wearable-360x360-1btn/info.ini +++ b/tizen/src/skin/client/skins/wearable-360x360-1btn/info.ini @@ -1,4 +1,4 @@ -skin.name=Wearable 360x360 +skin.name=W square 360x360 resolution.width=360 resolution.height=360 manager.priority=1 diff --git a/tizen/src/skin/client/skins/wearableO-360x360-1btn/info.ini b/tizen/src/skin/client/skins/wearableO-360x360-1btn/info.ini index 4c7288aff7..f6b9491542 100644 --- a/tizen/src/skin/client/skins/wearableO-360x360-1btn/info.ini +++ b/tizen/src/skin/client/skins/wearableO-360x360-1btn/info.ini @@ -1,4 +1,4 @@ -skin.name=Wearable O 360x360 +skin.name=W circle 360x360 resolution.width=360 resolution.height=360 manager.priority=1 |