Merge branch 'features/smp' into tizen_next 18/30618/3
authorKitae Kim <kt920.kim@samsung.com>
Fri, 21 Nov 2014 06:52:51 +0000 (15:52 +0900)
committerKitae Kim <kt920.kim@samsung.com>
Mon, 24 Nov 2014 08:44:21 +0000 (17:44 +0900)
commitf46a7f0048400251a9fed9bf8f99b179ff81993a
treedaca92ae9977163ce7f3b1b5614b1669ca4a86fb
parentd1de59add5c64e57b1972133bf9db1e3ee2d8b5a
parentc427bfda95bc2fc85ad108d635bf141635e0e41c
Merge branch 'features/smp' into tizen_next

Conflicts:
exec.c
target-i386/hax-all.c
target-i386/hax-darwin.c
target-i386/hax-windows.c
tizen/src/emulator.c
tizen/src/emulator.h
vl.c

Change-Id: Iba98ee338dc385c4d1129eed0c37e2a185b4d851
Makefile.target
configure
target-i386/hax-windows.c
target-i386/translate.c
tizen/src/skin/maruskin_operation.c
vl.c