Revert "upstream merge"
authorWooHyun Jung <wh0705.jung@samsung.com>
Thu, 26 Jul 2012 08:18:54 +0000 (17:18 +0900)
committerWooHyun Jung <wh0705.jung@samsung.com>
Thu, 26 Jul 2012 08:18:54 +0000 (17:18 +0900)
commitb0b3686f6acede73c0d7dc0f2cc4cfcac3c6038c
tree306af145052a03c04f5f136a464edef99c4af064
parentf7646a28364038ab545821d6695ce9d9e9397cc2
Revert "upstream merge"

This reverts commit c1608e664b37492af3a56d60dc4cba309eb4e99f, reversing
changes made to d393f86867ac227f0b07eb70b7ffc7decbb286fa.

Conflicts:

packaging/edje.spec
16 files changed:
AUTHORS
ChangeLog
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