Merge remote-tracking branch 'origin/upstream'
authorMike McCormack <mj.mccormack@samsung.com>
Thu, 10 Nov 2011 05:18:33 +0000 (14:18 +0900)
committerMike McCormack <mj.mccormack@samsung.com>
Thu, 10 Nov 2011 05:18:33 +0000 (14:18 +0900)
commit8668e496a6aad269684e5af6939c38c9a3aecc3d
treedc2245eac3c521f8271c78a77cff7bbda819b8bf
parent76f5da16e10a3b81c2b956672f285a82944b8c9e
parentc17649ca4f8b680cb4b186cbd92d8c56387af20f
Merge remote-tracking branch 'origin/upstream'
src/bin/edje_cc_handlers.c
src/lib/Edje.h
src/lib/edje_private.h