Merge coflicts related with QEMU build
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Thu, 4 Jul 2013 03:29:33 +0000 (12:29 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Thu, 4 Jul 2013 03:29:33 +0000 (12:29 +0900)
commit811f7ba37de90a67160d70dfa43c343aade8ff51
treefa57d4daa67007925c5cbb66c4f75a35e8012728
parent77d674c8e24c91926ee69fee77f5e17e8f0c31fe
Merge coflicts related with QEMU build

Change-Id: Ied530b6f41979f4b1b2eda77e62fbca4779cbd01
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Makefile
configure
hw/Makefile.objs