projects / profile / ivi / ecore.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 685e1fb 622e8e9)
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)
Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
src/lib/ecore/ecore_thread.c

1  2 
ChangeLog patch | diff1 | diff2 | blob | history
NEWS patch | diff1 | diff2 | blob | history
src/lib/ecore_con/ecore_con_url.c patch | diff1 | diff2 | blob | history

diff --cc ChangeLog
Simple merge
diff --cc NEWS
Simple merge
diff --cc src/lib/ecore_con/ecore_con_url.c
Simple merge
Domain: UI Framework / Uncategorized;