projects / framework / uifw / ecore.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 273c465 42fd5a9)
Merge remote-tracking branch 'origin/upstream'
authorMike McCormack <mj.mccormack@samsung.com>
Thu, 10 Nov 2011 02:40:27 +0000 (11:40 +0900)
committerMike McCormack <mj.mccormack@samsung.com>
Thu, 10 Nov 2011 02:40:27 +0000 (11:40 +0900)
Conflicts:
src/lib/ecore_file/ecore_file_download.c

1  2 
src/lib/ecore_con/ecore_con_url.c patch | diff1 | diff2 | blob | history
src/lib/ecore_x/Ecore_X.h patch | diff1 | diff2 | blob | history

diff --cc src/lib/ecore_con/ecore_con_url.c
Simple merge
diff --cc src/lib/ecore_x/Ecore_X.h
Simple merge
Domain: UI Framework / Uncategorized;