projects / framework / uifw / elementary.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ee3c8d 9dd156d)
Elementary migration revision 70200 Merge remote-tracking branch 'remotes/origin...
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Tue, 17 Apr 2012 07:30:33 +0000 (16:30 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Tue, 17 Apr 2012 07:30:33 +0000 (16:30 +0900)
Conflicts:
src/lib/elm_cnp.c
src/lib/elm_entry.c
src/lib/elm_gen_common.h
src/lib/elm_genlist.c

Change-Id: I1208222b2618757418cec7da702081558049af7e

1  2 
src/lib/elm_datetime.c patch | diff1 | diff2 | blob | history
src/lib/elm_genlist.h patch | diff1 | diff2 | blob | history

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