Merge remote-tracking branch 'origin/upstream'
authorMike McCormack <mj.mccormack@samsung.com>
Thu, 10 Nov 2011 04:50:51 +0000 (13:50 +0900)
committerMike McCormack <mj.mccormack@samsung.com>
Thu, 10 Nov 2011 04:50:51 +0000 (13:50 +0900)
commit7b299b8767024f11298e4da28cf1dc30399e0ba4
tree80e5645f65630d9417fb8e9766fccdd1f00fa2e3
parent03d47e95a55ca0d33d9c6246b1cb95be72a34773
parentb66e0a6bcf47903ca2920301b37d3b1403aa8692
Merge remote-tracking branch 'origin/upstream'
src/lib/canvas/evas_object_image.c