projects
/
framework
/
uifw
/
evas.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
18a614f
d4d50f7
)
Merge remote branch 'origin/upstream' into svn_merge
author
Jaehwan Kim
<jae.hwan.kim@samsung.com>
Mon, 22 Aug 2011 08:34:23 +0000
(17:34 +0900)
committer
Jaehwan Kim
<jae.hwan.kim@samsung.com>
Mon, 22 Aug 2011 08:34:23 +0000
(17:34 +0900)
1
2
src/lib/Evas.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/lib/Evas.h
Simple merge