fix conflict test_focus.c
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Fri, 9 Mar 2012 06:11:16 +0000 (15:11 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Fri, 9 Mar 2012 06:11:16 +0000 (15:11 +0900)
commitdbc25140bb0f072da2fa43b052eed17077730214
treea8dccda1eeb06525a098d7162cbf0ce5e53ebfb4
parentad9d32878b5fa1ee2cc51d457eb096d609124373
fix conflict test_focus.c
src/bin/test_focus.c