Merge Conflict resolved.
authorshilpa onkar singh <shilpa.singh@samsung.com>
Fri, 18 Feb 2011 06:05:32 +0000 (11:35 +0530)
committershilpa onkar singh <shilpa.singh@samsung.com>
Fri, 18 Feb 2011 06:05:32 +0000 (11:35 +0530)
commitef8d53f1c81b60f609d936bb9d058c6a431b0cf8
tree913d4f768b60a7858e15a0655462e306cad6b9df
parentab232200f29cabbe7abba8cf10f3321df8ef19fc
Merge Conflict resolved.
[elm_conform]: review comments fixed for popup changes
Change-Id: I4382344ddf16e05250472fb0700c7db4b6e5d5b7
src/lib/Elementary.h.in
src/lib/elm_conform.c