devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=08e21736524f622bd1c041ad555d602ba4121570

commit 08e21736524f622bd1c041ad555d602ba4121570
Merge: a2025dd 5515f19
Author: Chris Michael <[email protected]>
Date:   Tue Mar 18 09:14:58 2014 +0000

    Merge branch 'devs/devilhorns/drm'

 README.wayland                                     | 133 ++++
 configure.ac                                       |  17 +-
 src/bin/Makefile.mk                                |   6 +-
 src/bin/e.h                                        |   4 +
 src/bin/e_actions.c                                |   6 +
 src/bin/e_alert.c                                  |   2 +
 src/bin/e_atoms.c                                  |   4 +
 src/bin/e_backlight.c                              |  11 +-
 src/bin/e_bindings.c                               |  24 +-
 src/bin/e_canvas.c                                 |  19 +-
 src/bin/e_client.c                                 |   9 +
 src/bin/e_client.h                                 |   6 +-
 src/bin/e_comp.c                                   |  14 +-
 src/bin/e_comp_object.c                            |   5 +-
 src/bin/e_comp_wl.c                                |  16 +-
 src/bin/e_comp_wl.h                                |   9 +-
 src/bin/e_desk.c                                   |   2 +
 src/bin/e_desklock.c                               |   6 +-
 src/bin/e_dialog.c                                 |   2 +
 src/bin/e_dnd.c                                    |  45 +-
 src/bin/e_dpms.c                                   |  10 +
 src/bin/e_entry.c                                  |  13 +-
 src/bin/e_fm.c                                     |  26 +-
 src/bin/e_focus.c                                  |   4 +
 src/bin/e_grab_dialog.c                            |   4 +
 src/bin/e_grabinput.c                              |  20 +
 src/bin/e_hints.c                                  |  89 ++-
 src/bin/e_hints.h                                  |   2 +-
 src/bin/e_includes.h                               |   3 +-
 src/bin/e_int_client_prop.c                        |   4 +
 src/bin/e_main.c                                   |   6 +
 src/bin/e_module.c                                 |   4 +-
 src/bin/e_mouse.c                                  |   4 +
 src/bin/e_pixmap.c                                 |  34 +-
 src/bin/e_pointer.c                                | 129 ++--
 src/bin/e_scale.c                                  |   4 +-
 src/bin/e_screensaver.c                            |   6 +-
 src/bin/e_signals.c                                |  10 +
 src/bin/e_win.c                                    |  42 +-
 src/bin/e_xkb.c                                    |   2 +
 src/modules/Makefile.mk                            |   3 +-
 src/modules/Makefile_wl_drm.mk                     |  17 +
 .../conf_bindings/e_int_config_acpibindings.c      |  12 +-
 src/modules/conf_display/e_int_config_desklock.c   |   2 +
 src/modules/conf_theme/e_int_config_scale.c        |   6 +-
 src/modules/fileman/e_fwin.c                       |   6 +
 src/modules/fileman/e_fwin_nav.c                   |   2 +
 src/modules/pager/e_mod_main.c                     |  10 +-
 src/modules/pager16/e_mod_main.c                   |   6 +-
 src/modules/tiling/e_mod_tiling.c                  |   2 +-
 src/modules/winlist/e_winlist.c                    |   8 +-
 src/modules/wizard/page_150.c                      |   2 +-
 src/modules/wl_desktop_shell/e_mod_main.c          |   4 +-
 src/modules/wl_drm/e-module-wl_drm.edj             | Bin 13048 -> 0 bytes
 src/modules/wl_drm/e_drm_output.c                  | 604 -----------------
 src/modules/wl_drm/e_evdev.c                       | 664 -------------------
 src/modules/wl_drm/e_mod_main.c                    | 726 ++-------------------
 src/modules/wl_drm/e_mod_main.h                    | 234 -------
 src/modules/wl_drm/e_sprite.c                      |  88 ---
 src/modules/wl_drm/e_tty.c                         | 201 ------
 src/modules/wl_drm/module.desktop                  |  16 -
 61 files changed, 668 insertions(+), 2701 deletions(-)

-- 


Reply via email to