Merge branch 'develop' into features/new_ui
authorjihye424.kim <jihye424.kim@samsung.com>
Tue, 22 Dec 2015 06:35:17 +0000 (15:35 +0900)
committerjihye424.kim <jihye424.kim@samsung.com>
Tue, 22 Dec 2015 06:35:17 +0000 (15:35 +0900)
commitcf1a22f333a3cfc61e5b241b6c7bd2099adca737
treeb7439796e0fb83dfdad7ca997ab0c2584334a97c
parent0ecc5b7597c519baf577e07396fdae0b1cc3c248
parentd069259ce93066a32985a7377304f8b7edad5482
Merge branch 'develop' into features/new_ui

Conflicts:
        src/org/tizen/emulator/manager/ui/widgets/CommonVMButtonPainter.java
        src/org/tizen/emulator/manager/ui/widgets/VMButton.java
        src/org/tizen/emulator/manager/vms/VMWorkerCommon.java
        src/org/tizen/emulator/manager/vms/helper/CheckingRunningEmulator.java

Change-Id: Ie263280cb0e57decadc20bf8fdcd1795505ec342
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>
15 files changed:
package/changelog
package/pkginfo.manifest
resource/strings/uimessages.properties
src/org/tizen/emulator/manager/EmulatorManager.java
src/org/tizen/emulator/manager/console/ConsoleProcessor.java
src/org/tizen/emulator/manager/resources/StringResources.java
src/org/tizen/emulator/manager/tool/TapUtil.java
src/org/tizen/emulator/manager/ui/VMsDetailView.java
src/org/tizen/emulator/manager/ui/renewal/dialog/TapDeviceDialogForWin.java
src/org/tizen/emulator/manager/ui/renewal/tableviewer/MenuHandling.java
src/org/tizen/emulator/manager/ui/widgets/CommonVMButtonPainter.java
src/org/tizen/emulator/manager/ui/widgets/VMButton.java
src/org/tizen/emulator/manager/vms/VMWorkerCommon.java
src/org/tizen/emulator/manager/vms/helper/CheckingRunningEmulator.java
src/org/tizen/emulator/manager/vms/helper/HelperClass.java