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)
commit1969befca75d2e064c4caf5fae75cb32942f8600
tree3481fb50736341af50a5e5796b73d411f51afc7e
parentb803fe7e92657861e54eafd40ca848d8022b9d00
parentda22f119142f00d6055c44980c8e762a771c8988
Merge branch 'master' of ssh://165.213.149.219:29418/slp/pkgs/e/ecore

Conflicts:
ChangeLog
src/lib/ecore_imf/ecore_imf_context.c
src/lib/ecore_ipc/ecore_ipc.c