Merge branch 'tizen-arm' of http://121.133.176.49/review/p/sdk/emulator/qemu into...
authorEvgeny Voevodin <e.voevodin@samsung.com>
Wed, 17 Oct 2012 09:14:14 +0000 (13:14 +0400)
committerEvgeny Voevodin <e.voevodin@samsung.com>
Wed, 17 Oct 2012 09:14:14 +0000 (13:14 +0400)
commit09d0daa33ba91c8a8417e6a4da4410bdb46f55c8
treeea6b498a8aa96c4c2a4c8de8728b102aea7767be
parent0a0de4a1040078bd49ab1b2fa7c481ab65f18f95
parent0e3f99daa5784dbb7937eb3c60627d4d200db139
Merge branch 'tizen-arm' of 121.133.176.49/review/p/sdk/emulator/qemu into tizen-arm

Conflicts:
tizen/emulator_configure.sh

Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com>
tizen/emulator_configure.sh