Elementary migration revision 69922

Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
	src/lib/elm_gen_common.h
	src/lib/elm_genlist.c
	src/lib/elm_genlist.h

diff --cc elementary.pc.in
index b0bc2a1,b0bc2a1..9ad55ff
--- 1/elementary.pc.in
--- 2/elementary.pc.in
+++ b/elementary.pc.in
@@@ -5,6 -5,6 +5,8 @@@ includedir=@includedir
  
  Name: elementary
  Description: Mobile device touchscreen widget library
++@pkgconfig_requires_private@: @requirement_elm@
  Version: @VERSION@
  Libs: -L${libdir} -lelementary @my_libs@ @ELEMENTARY_LIBS@ @EVIL_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_ETHUMB_LIBS@ @ELEMENTARY_WEB_LIBS@ @ELEMENTARY_EMAP_LIBS@ @ELEMENTARY_ECORE_IMF_LIBS@ @ELEMENTARY_ECORE_CON_LIBS@
++Libs.private: @dlopen_libs@ @my_libs@ @ELEMENTARY_LIBS@ @EVIL_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_ETHUMB_LIBS@ @ELEMENTARY_WEB_LIBS@ @ELEMENTARY_EMAP_LIBS@ @ELEMENTARY_ECORE_IMF_LIBS@ @ELEMENTARY_ECORE_CON_LIBS@
  Cflags: -I${includedir}/elementary-@VMAJ@ @ELEMENTARY_CFLAGS@ @EVIL_CFLAGS@ @ELEMENTARY_EFREET_CFLAGS@ @ELEMENTARY_EDBUS_CFLAGS@ @ELEMENTARY_ETHUMB_CFLAGS@ @ELEMENTARY_WEB_CFLAGS@ @ELEMENTARY_EMAP_CFLAGS@ @ELEMENTARY_ECORE_IMF_CFLAGS@ @ELEMENTARY_ECORE_CON_CFLAGS@

diff --cc src/bin/test_dayselector.c
Simple merge

diff --cc src/bin/test_genlist.c
Simple merge

diff --cc src/bin/test_label.c
Simple merge

diff --cc src/bin/test_tooltip.c
Simple merge

diff --cc src/bin/test_win_socket.c
index d8b87ba,223bb57..223bb57
mode 100755,100644..100755
--- 1/src/bin/test_win_socket.c
--- 2/src/bin/test_win_socket.c
+++ b/src/bin/test_win_socket.c

diff --cc src/lib/elm_check.c
Simple merge

diff --cc src/lib/elm_entry.h
Simple merge

diff --cc src/lib/elm_index.c
Simple merge

diff --cc src/lib/elm_index.h
Simple merge

diff --cc src/lib/elm_widget.h
Simple merge

diff --cc src/lib/els_scroller.c
Simple merge