Merge branch 'develop' into features/new_ui
authorminkee.lee <minkee.lee@samsung.com>
Wed, 23 Dec 2015 05:28:18 +0000 (14:28 +0900)
committerminkee.lee <minkee.lee@samsung.com>
Wed, 23 Dec 2015 05:28:25 +0000 (14:28 +0900)
commit976d5896990465fe202a10c294a112c03b4ea446
treee21e1cd4babb8899ab0006100797b8d6f993d61a
parent455000216676fa46125edd4c9da6171029f09b4c
parent04b80efc93ef1a65c2561743767175d39408a35b
Merge branch 'develop' into features/new_ui

Conflicts:
src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java

Change-Id: I3924dddfb46e1a4b69b64afa5ec9c4709f195a07
Signed-off-by: minkee.lee <minkee.lee@samsung.com>
package/changelog
package/pkginfo.manifest
resource/strings/uimessages.properties
src/org/tizen/emulator/manager/EmulatorManager.java
src/org/tizen/emulator/manager/tool/About.java
src/org/tizen/emulator/manager/tool/TapUtil.java
src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java
src/org/tizen/emulator/manager/vms/VMLauncher.java