Merge branch 'develop' into develop_qemu_2.6

Change-Id: Iedd4489f6321fa251bd7cbe917e258cd1f60f21d
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --cc hw/vigs/vigs_device.c
index b71a57b,d802319..7d0919a
--- 1/hw/vigs/vigs_device.c
--- 2/hw/vigs/vigs_device.c
+++ b/hw/vigs/vigs_device.c
@@@ -42,7 -42,7 +42,8 @@@
  #include "ui/console.h"
  #include "qemu/main-loop.h"
  #include "qemu/error-report.h"
 +#include "qapi/error.h"
+ #include "sysemu/sysemu.h"
  
  #define PCI_VENDOR_ID_VIGS 0x19B2
  #define PCI_DEVICE_ID_VIGS 0x1011

diff --cc tizen/src/emul_state.c
index c591900,8a2ddf4..43fdb50
--- 1/tizen/src/emul_state.c
--- 2/tizen/src/emul_state.c
+++ b/tizen/src/emul_state.c
@@@ -396,7 -393,11 +396,12 @@@ const char *get_profile_name(void
      return get_variable("profile");
  }
  
+ const char *get_platform_version(void)
+ {
+     return get_variable("platform_version");
+ }
+ 
 +#ifdef CONFIG_VIRTFS
  // host directory sharing path
  const char* get_host_directory_sharing_path(void)
  {

diff --cc tizen/src/hw/virtio/maru_virtio_input.c
Simple merge

diff --cc tizen/src/ui/menu/contextmenu.cpp
Simple merge

diff --cc tizen/src/util/new_debug_ch.h
Simple merge

diff --cc ui/cocoa.m
Simple merge