Kai Huuhko 74031458df Merge branch 'master' into elmfusion ... Conflicts: efl/evas/efl.evas_object_textgrid.pxi		2015-05-07 14:24:00 +03:00
..
dbus	Examples: Fixed ecore_x and dbus examples	2015-05-04 08:38:27 +03:00
ecore/x	Examples: Fixed ecore_x and dbus examples	2015-05-04 08:38:27 +03:00
elementary	Merge branch 'master' into elmfusion	2015-05-07 14:24:00 +03:00
emotion	Remove init/shutdown from elm and emotion main tests	2015-05-04 03:36:54 +03:00