EFL core migration revision 69424
authorJeonghyun Yun <jh0506.yun@samsung.com>
Fri, 16 Mar 2012 07:21:35 +0000 (16:21 +0900)
committerJeonghyun Yun <jh0506.yun@samsung.com>
Fri, 16 Mar 2012 07:24:34 +0000 (16:24 +0900)
commit3338f47e6702cd1ff8d73b9906fc626d4910c758
tree7bc1eca1c3459d53b54a16402163d1a8e7f23a11
parent685e1fb99bab044b6c6ef18ed7d02f97dec4a3a3
parent622e8e94d900207e9835001705da2ef81b8a8410
EFL core migration revision 69424
Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
src/lib/ecore/ecore_thread.c
ChangeLog
NEWS
src/lib/ecore_con/ecore_con_url.c