Elementary migration revision 69448
authorJeonghyun Yun <jh0506.yun@samsung.com>
Fri, 16 Mar 2012 08:03:24 +0000 (17:03 +0900)
committerJeonghyun Yun <jh0506.yun@samsung.com>
Fri, 16 Mar 2012 08:03:24 +0000 (17:03 +0900)
commit7d5703d105334ee210609a51f547b1fac7ad3be7
tree27bef55a68fa23586edef9fd608c9884dce5319c
parent922c03c93473c91ff576952705ef320ad3800e7e
parent981b0a9a559ffba48c2189a1bc31e0e82ea2d26e
Elementary migration revision 69448
Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
doc/examples.dox
src/bin/test_genlist.c
src/lib/Makefile.am
src/lib/elc_multibuttonentry.c
src/lib/elm_colorselector.c
src/lib/elm_conform.c
src/lib/elm_deprecated.h
src/lib/elm_entry.c
src/lib/elm_flipselector.c
src/lib/elm_gen.h
src/lib/elm_genlist.c
src/lib/elm_main.c
src/lib/elm_map.c
20 files changed:
src/bin/test_genlist.c
src/bin/test_tooltip.c
src/lib/Makefile.am
src/lib/elc_ctxpopup.c
src/lib/elc_multibuttonentry.c
src/lib/elm_colorselector.c
src/lib/elm_config.c
src/lib/elm_diskselector.c
src/lib/elm_entry.c
src/lib/elm_entry.h
src/lib/elm_genlist.c
src/lib/elm_genlist.h
src/lib/elm_index.c
src/lib/elm_index.h
src/lib/elm_map.c
src/lib/elm_removed.h
src/lib/elm_slider.c
src/lib/elm_toolbar.c
src/lib/elm_win.c
src/lib/els_scroller.c