Merge branch 'develop' into develop_qemu_2.6
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 6 Jul 2016 06:04:32 +0000 (15:04 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 6 Jul 2016 06:04:40 +0000 (15:04 +0900)
commit4875fd78bfeab06790761c3cea222d7b6820a4dd
tree1ac2934e8bf2c740ddd4fc376ed35825e0a5579c
parenta9e6051745ab94ba54a0222e3c16b77787de5369
parentdef074889d66bfec4a5c4bd82cc3f39f3eb1e397
Merge branch 'develop' into develop_qemu_2.6

Change-Id: Id31ceffdbfe8938ea70a11f904fb38e2c4732dd0
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
tizen/src/ecs/ecs_eventcast.c
tizen/src/emul_state.c
tizen/src/hw/virtio/maru_virtio_esm.c
tizen/src/hw/virtio/maru_virtio_input.c
tizen/src/hw/virtio/maru_virtio_pci.c
tizen/src/util/net_helper.c
tizen/src/util/ui_operations.c