Merge branch 'develop' into features/new_ui
authorminkee.lee <minkee.lee@samsung.com>
Tue, 5 Jan 2016 06:06:33 +0000 (15:06 +0900)
committerminkee.lee <minkee.lee@samsung.com>
Tue, 5 Jan 2016 06:06:41 +0000 (15:06 +0900)
commit28b1ff76a3fe4df5c415f25772b6eea8b4adda95
tree8255d83b19fe4dd08d19783b337ce4f57e3cc63d
parente27e19939c89884cef31709d3e1386f9d8ac8c04
parentab0e69ddbd4b477f180573ef0c7c9f765b2b991d
Merge branch 'develop' into features/new_ui

Conflicts:
src/org/tizen/emulator/manager/platform/BaseImage.java
src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java
src/org/tizen/emulator/manager/vms/Creator.java
src/org/tizen/emulator/manager/vms/option/LaunchConfig.java

Change-Id: I3021d3a96717209dcc9ce12bcc0e5906311e3445
Signed-off-by: minkee.lee <minkee.lee@samsung.com>
package/changelog
package/pkginfo.manifest
src/org/tizen/emulator/manager/EmulatorManager.java
src/org/tizen/emulator/manager/platform/BaseImage.java
src/org/tizen/emulator/manager/ui/detail/item/property/BaseImageViewItem.java
src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java
src/org/tizen/emulator/manager/vms/Creator.java
src/org/tizen/emulator/manager/vms/option/LaunchConfig.java