[index]Fixed conflicts (elm_index.c/elm_index.h)
authorGoun Lee <gouni.lee@samsung.com>
Thu, 8 Mar 2012 10:44:30 +0000 (19:44 +0900)
committerGoun Lee <gouni.lee@samsung.com>
Thu, 8 Mar 2012 10:44:30 +0000 (19:44 +0900)
commitaf1e1480aa9bb4392a57388041c84d97f66113ec
tree6889519cb83a472d5e68a50a36440fe3df26c78d
parentb796ff515eb43db602daa11201f85130a375233e
[index]Fixed conflicts (elm_index.c/elm_index.h)
src/lib/elm_index.c
src/lib/elm_index.h