review.tizen.org Git - framework/uifw/edje.git/commit

projects / framework / uifw / edje.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9d1ba0d fcb62f4)

author	Jiyoun Park <jy0703.park@samsung.com>
	Wed, 20 Jun 2012 08:30:04 +0000 (17:30 +0900)
committer	Jiyoun Park <jy0703.park@samsung.com>
	Wed, 20 Jun 2012 08:30:04 +0000 (17:30 +0900)
commit	a15299a01c0c89d7ed33391c911eb8b2ad2020d2
tree	48386c104c8b3277da25cf4f6451570305262150	tree \| snapshot
parent	9d1ba0d03223a3017d2d0251dcaefb1f66ff879b	commit \| diff
parent	fcb62f429912a2e1fbb978eace7aa562c9f1865e	commit \| diff

Upstrem merge
Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
ChangeLog
src/bin/edje_cc.c
src/lib/edje_multisense.c

Change-Id: Ifbfee1960a076241711ffc4560d9b806f8cab53f

15 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
ChangeLog	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
packaging/edje.spec	diff1 \|	\|	blob \| history
src/bin/edje_cc_handlers.c	diff1 \|	diff2 \|	blob \| history
src/lib/Edje.h	diff1 \|	diff2 \|	blob \| history
src/lib/edje_calc.c	diff1 \|	diff2 \|	blob \| history
src/lib/edje_entry.c	diff1 \|	diff2 \|	blob \| history
src/lib/edje_main.c	diff1 \|	diff2 \|	blob \| history
src/lib/edje_private.h	diff1 \|	diff2 \|	blob \| history
src/lib/edje_program.c	diff1 \|	diff2 \|	blob \| history
src/lib/edje_util.c	diff1 \|	diff2 \|	blob \| history
src/modules/alsa_snd_player/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/modules/eet_snd_reader/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/modules/multisense_factory/Makefile.am	diff1 \|	diff2 \|	blob \| history

Domain: UI Framework / Uncategorized;