merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:19:13 +0000 (01:19 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:19:13 +0000 (01:19 +0900)
commit516c5b8aa7c2f90dfc7a9a52b9e2173842ec3efc
tree67ef0f9ab3d5c38301f29c85c00e58632acd443c
parent04da54b9b8738a3cbbfbcc8599063e74bfc0951c
merge with master
16 files changed:
AUTHORS
ChangeLog
NEWS
packaging/edje.spec
src/bin/edje_cc_handlers.c
src/bin/edje_cc_out.c
src/bin/edje_inspector.c
src/lib/Edje.h
src/lib/edje_calc.c
src/lib/edje_embryo.c
src/lib/edje_entry.c
src/lib/edje_multisense.c
src/lib/edje_private.h
src/lib/edje_program.c
src/lib/edje_util.c
src/modules/multisense_factory/multisense_factory.c