[efl-upgrade]
authorJeahwan Kim <jae.hwan.kim@samsung.com>
Fri, 10 Sep 2010 10:27:33 +0000 (19:27 +0900)
committerJeahwan Kim <jae.hwan.kim@samsung.com>
Fri, 10 Sep 2010 10:27:33 +0000 (19:27 +0900)
commit49e5760106ad15d0d4f3d6d4fffcb91a21359da7
treec167ba03cc730201f259fbcbaab8fec6704cd941
parent203b51c04b5db5012ceea3796c9c8dddb50e10ba
parentbbf5654f2779e06d2f6af273b6c344e1bbc643bf
[efl-upgrade]
Merge with EFL svn repo

Merge branch 'svn_merge'

Conflicts:
configure.ac
data/themes/default.edc
src/lib/Elementary.h.in
src/lib/Makefile.am
src/lib/elm_animator.c
src/lib/elm_cnp_helper.c
src/lib/elm_entry.c
src/lib/elm_gengrid.c
src/lib/elm_genlist.c
src/lib/elm_index.c
src/lib/elm_label.c
src/lib/elm_main.c
src/lib/elm_notify.c
src/lib/elm_pager.c
src/lib/elm_priv.h
src/lib/elm_scroller.c
56 files changed:
configure.ac
data/themes/default.edc
debian/changelog
debian/control
src/lib/Elementary.h.in
src/lib/Makefile.am
src/lib/elc_anchorblock.c
src/lib/elc_anchorview.c
src/lib/elc_fileselector.c
src/lib/elc_fileselector_button.c
src/lib/elc_hoversel.c
src/lib/elc_notepad.c
src/lib/elc_scrolled_entry.c
src/lib/elm_animator.c
src/lib/elm_bubble.c
src/lib/elm_button.c
src/lib/elm_check.c
src/lib/elm_clock.c
src/lib/elm_config.c
src/lib/elm_conform.c
src/lib/elm_entry.c
src/lib/elm_flip.c
src/lib/elm_frame.c
src/lib/elm_gengrid.c
src/lib/elm_genlist.c
src/lib/elm_hover.c
src/lib/elm_icon.c
src/lib/elm_image.c
src/lib/elm_index.c
src/lib/elm_layout.c
src/lib/elm_list.c
src/lib/elm_main.c
src/lib/elm_map.c
src/lib/elm_mapbuf.c
src/lib/elm_menu.c
src/lib/elm_notify.c
src/lib/elm_pager.c
src/lib/elm_panel.c
src/lib/elm_photo.c
src/lib/elm_photocam.c
src/lib/elm_priv.h
src/lib/elm_progressbar.c
src/lib/elm_radio.c
src/lib/elm_scroller.c
src/lib/elm_slider.c
src/lib/elm_slideshow.c
src/lib/elm_spinner.c
src/lib/elm_theme.c
src/lib/elm_thumb.c
src/lib/elm_toggle.c
src/lib/elm_toolbar.c
src/lib/elm_widget.c
src/lib/elm_win.c
src/lib/els_scroller.c
src/modules/ctxpopup_copypasteUI/Makefile.am
src/modules/popup_copypasteUI/Makefile.am