projects / framework / uifw / emotion.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 328c619 5e8105e)
EFL migration revision 67705
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 14 Feb 2012 09:07:30 +0000 (18:07 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Wed, 15 Feb 2012 07:25:52 +0000 (16:25 +0900)
Merge remote branch 'origin/upstream'

Conflicts:
.gitignore


Trivial merge
Domain: UI Framework / Uncategorized;