Revert "Revert "upstream merge""
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 14 Aug 2012 12:30:16 +0000 (21:30 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 14 Aug 2012 12:30:16 +0000 (21:30 +0900)
commit4b1de353173342ec5fbb6126a938556236e8ea82
treef50b1b5a13397d717e77ef9aaec0b69acefdb6e1
parentab0697c4856906f191c14858f65fce0ce91d1eb9
Revert "Revert "upstream merge""

This reverts commit b0b3686f6acede73c0d7dc0f2cc4cfcac3c6038c.

Conflicts:

AUTHORS
ChangeLog
14 files changed:
Makefile.am
NEWS
src/bin/Makefile.am
src/bin/edje_cc.c
src/bin/edje_cc_handlers.c
src/bin/edje_cc_out.c
src/lib/Edje.h
src/lib/edje_calc.c
src/lib/edje_data.c
src/lib/edje_entry.c
src/lib/edje_load.c
src/lib/edje_multisense.c
src/lib/edje_private.h
src/lib/edje_util.c