Elementary migration revision 70341
authorShinwoo Kim <cinoo.kim@samsung.com>
Fri, 20 Apr 2012 01:17:38 +0000 (10:17 +0900)
committerShinwoo Kim <cinoo.kim@samsung.com>
Fri, 20 Apr 2012 01:20:27 +0000 (10:20 +0900)
commitbd69050c18b84e7fd20e137be5c75831ca7674af
tree924d892fc54a56ee99feee0f26445e4207b67f61
parentab8448648095bca2d93a36920d02871f364c88bf
parent0331011c0069be9092385e7f0ad38cd2d5627833
Elementary migration revision 70341
Merge remote branch 'remotes/origin/upstream'

Conflicts:
src/lib/elm_datetime.c
src/lib/elm_genlist.c
src/lib/elm_config.h
src/lib/elm_diskselector.c
src/lib/elm_entry.h
src/lib/elm_genlist.h
src/lib/elm_index.h
src/lib/elm_plug.h
src/lib/elm_win.h