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)
commitcbeeb0232de2508cfbe9c1bf957756a0d2d2a63c
tree5bf13f2e073dba1b2dce957f0e364ab3693b1a1d
parent0ee3c8d89d22fcba0d017f94faa78dc499da325e
parent9dd156d49abfbfe17808a34bcafe86195b770a85
Elementary migration revision 70200 Merge remote-tracking branch 'remotes/origin/upstream'

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
src/lib/elm_datetime.c
src/lib/elm_genlist.h