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

projects / sdk / emulator / qemu.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: fc7b6a7 6b1f06f)

author	Jinhyung Jo <jinhyung.jo@samsung.com>
	Mon, 12 Sep 2016 05:29:16 +0000 (14:29 +0900)
committer	Jinhyung Jo <jinhyung.jo@samsung.com>
	Mon, 12 Sep 2016 05:29:16 +0000 (14:29 +0900)
commit	a572eb13164d46afb24394022c166a19cd552d70
tree	2353e8e8451fdf144d4cddc7de59f579a4be3f96	tree \| snapshot
parent	fc7b6a78204b506068da09a2fba5b04b62cfcac5	commit \| diff
parent	6b1f06f25070e6d54afe1c887480a0b0f5a9eeda	commit \| diff

Merge branch 'features/newscreen' into develop

Conflicts:
tizen/src/ui/qt5_supplement.cpp

Change-Id: Icd310f98594684aa96142b1a7c1af767d3cb16c5
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>

tizen/src/ui/displaybase.cpp	diff1 \|	diff2 \|	blob \| history
tizen/src/ui/mainwindow.cpp	diff1 \|	diff2 \|	blob \| history
tizen/src/ui/qt5.c	diff1 \|	diff2 \|	blob \| history
tizen/src/ui/qt5.h	diff1 \|	diff2 \|	blob \| history
tizen/src/ui/qt5_supplement.cpp	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history

Domain: SDK / Emulator;