projects
/
framework
/
uifw
/
ecore.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
07a6cd4
3721232
)
Merge remote-tracking branch 'origin/upstream'
author
Mike McCormack
<mj.mccormack@samsung.com>
Wed, 16 Nov 2011 23:33:48 +0000
(08:33 +0900)
committer
Mike McCormack
<mj.mccormack@samsung.com>
Wed, 16 Nov 2011 23:33:48 +0000
(08:33 +0900)
Conflicts:
po/cs.po
po/de.po
po/el.po
po/fr.po
po/it.po
po/nl.po
po/pt.po
po/sl.po
src/lib/ecore_con/ecore_con_url.c
1
2
src/lib/ecore/ecore_thread.c
patch
|
diff1
|
diff2
|
blob
|
history
src/lib/ecore_con/ecore_con_url.c
patch
|
diff1
|
diff2
|
blob
|
history
src/lib/ecore_evas/ecore_evas_x.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/lib/ecore/ecore_thread.c
Simple merge
diff --cc
src/lib/ecore_con/ecore_con_url.c
Simple merge
diff --cc
src/lib/ecore_evas/ecore_evas_x.c
Simple merge