[Merge Conflict Resolved in elementary.h.in]
authorShilpa Singh <shilpa.singh@samsung.com>
Tue, 5 Apr 2011 05:09:10 +0000 (10:39 +0530)
committerShilpa Singh <shilpa.singh@samsung.com>
Fri, 8 Apr 2011 05:59:55 +0000 (11:29 +0530)
commit14aba89ef8c041f6980d7dbf6a6505df5c01e80e
treead7cd0db347fc62e9cf20873d49e1571299ac203
parent10dba611b0c059ad9205a3911f232960697d11c4
[Merge Conflict Resolved in elementary.h.in]
[elm_navigationbar_ex]: show/hide API for title object.

Change-Id: I9e7a96494763a1e466437820095e7febb4775910
src/lib/Elementary.h.in
src/lib/elm_navigationbar_ex.c