Merge branch 'develop' into develop_qemu_2.6
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 26 Jul 2016 04:20:54 +0000 (13:20 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 26 Jul 2016 04:20:54 +0000 (13:20 +0900)
commitba4cc3d77207c1bf25a585c4255b2db7f15cd069
tree16daa0ec5763c30ef201cacf3f4ec9c60f66883e
parentb28120343e545e9d5a50f3b05952f3faefbaa6ef
parent1d947784dbcc184ecf4742ae0c188f231434d824
Merge branch 'develop' into develop_qemu_2.6

Change-Id: Iedd4489f6321fa251bd7cbe917e258cd1f60f21d
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
hw/vigs/vigs_device.c
tizen/src/emul_state.c
tizen/src/hw/virtio/maru_virtio_input.c
tizen/src/ui/menu/contextmenu.cpp
tizen/src/util/new_debug_ch.h
ui/cocoa.m