Merge branch 'master' of ssh://165.213.149.219:29418/slp/pkgs/e/ecore
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Wed, 15 Feb 2012 07:21:02 +0000 (16:21 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Wed, 15 Feb 2012 07:21:02 +0000 (16:21 +0900)
Conflicts:
ChangeLog

1  2 
src/lib/ecore_imf/ecore_imf_context.c
src/lib/ecore_ipc/ecore_ipc.c

Simple merge
Simple merge