EFL core migration @74702
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 7 Aug 2012 09:03:25 +0000 (18:03 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 7 Aug 2012 09:04:03 +0000 (18:04 +0900)
commit6319c761a2e2ba50b4c916284cb300f1ff3dd115
treeee7983d1f93feeb6125a027ba7444902da2a01b6
parent9d1ba0d03223a3017d2d0251dcaefb1f66ff879b
parentab7e8b5240ba7a2a73ed207b1a20834f28dbbd97
EFL core migration @74702
Merge remote-tracking branch 'origin/upstream' into HEAD

Conflicts:
ChangeLog
configure.ac
src/bin/edje_cc.c
src/bin/edje_cc_handlers.c
src/lib/edje_entry.c
src/lib/edje_multisense.c
16 files changed:
.gitignore
configure.ac
src/bin/edje_cc.c
src/bin/edje_cc_handlers.c
src/bin/edje_multisense_convert.c
src/lib/Edje.h
src/lib/edje_calc.c
src/lib/edje_entry.c
src/lib/edje_main.c
src/lib/edje_multisense.c
src/lib/edje_private.h
src/lib/edje_program.c
src/lib/edje_util.c
src/modules/alsa_snd_player/Makefile.am
src/modules/eet_snd_reader/Makefile.am
src/modules/multisense_factory/Makefile.am