review.tizen.org Git - sdk/emulator/qemu.git/commit

projects / sdk / emulator / qemu.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: acf7f2d d0298c4)

author	SeokYeon Hwang <syeon.hwang@samsung.com>
	Wed, 9 Sep 2015 05:34:17 +0000 (14:34 +0900)
committer	SeokYeon Hwang <syeon.hwang@samsung.com>
	Wed, 9 Sep 2015 05:34:28 +0000 (14:34 +0900)
commit	b1050aa3a33cd319ac2cfd50562bc5080d556bc8
tree	b613a01d2f69138d188a61cc8a15dca1810ff0ef	tree \| snapshot
parent	acf7f2d3415000785874eedb4fb31439ba5523d8	commit \| diff
parent	d0298c49b54b5a1fb096387cbe3a53647b433457	commit \| diff

Merge branch 'tizen_2.4_develop' into tizen_3.0_develop

Change-Id: Ibf4bc4ff0d810ce2653b248a896de7fd61497a98
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

14 files changed:

configure	diff1 \|	diff2 \|	blob \| history
package/3.0-emulator-qemu-x86.install.macos-64	diff1 \|	diff2 \|	blob \| history
package/3.0-emulator-qemu-x86.install.ubuntu-32	diff1 \|	diff2 \|	blob \| history
package/3.0-emulator-qemu-x86.install.ubuntu-64	diff1 \|	diff2 \|	blob \| history
package/3.0-emulator-qemu-x86.remove.ubuntu-32	diff1 \|	diff2 \|	blob \| history
package/3.0-emulator-qemu-x86.remove.ubuntu-64	diff1 \|	diff2 \|	blob \| history
package/changelog	diff1 \|	diff2 \|	blob \| history
package/pkginfo.manifest	diff1 \|	diff2 \|	blob \| history
tizen/emulator_configure.sh	diff1 \|	diff2 \|	blob \| history
tizen/src/Makefile	diff1 \|	diff2 \|	blob \| history
tizen/src/emul_state.c	diff1 \|	diff2 \|	blob \| history
tizen/src/emul_state.h	diff1 \|	diff2 \|	blob \| history
tizen/src/emulator.c	diff1 \|	diff2 \|	blob \| history
tizen/src/scripts/emulator.sh	diff1 \|	diff2 \|	blob \| history

Domain: SDK / Emulator;