projects / framework / uifw / elementary.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 857bb22 fca4978)
Elementary migration revision 69832
authorJeonghyun Yun <jh0506.yun@samsung.com>
Mon, 2 Apr 2012 11:04:21 +0000 (20:04 +0900)
committerJeonghyun Yun <jh0506.yun@samsung.com>
Mon, 2 Apr 2012 11:04:21 +0000 (20:04 +0900)
Merge commit 'refs/changes/92/27392/1' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary

Conflicts:
src/lib/elm_entry.c

1  2 
src/lib/elm_entry.c patch | diff1 | diff2 | blob | history

diff --cc src/lib/elm_entry.c
Simple merge
Domain: UI Framework / Uncategorized;