[elpa] 02/287: Merge branch 'externals/ergoemacs-mode' of git://git.sv.gnu.org/emacs/elpa

[Matthew Fidler]

mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.

commit 055ae7da831845694277455f713471cb98f7118b
Merge: 8e95ab1 a36c916
Author: Matthew L. Fidler <address@hidden>
Date:   Fri May 23 17:05:36 2014 +0800

    Merge branch 'externals/ergoemacs-mode' of git://git.sv.gnu.org/emacs/elpa

 Readme.org                |    1 -
 ergoemacs-advices.el      |    2 +-
 ergoemacs-extras.el       |    2 +-
 ergoemacs-functions.el    |    2 +-
 ergoemacs-layouts.el      |    2 +-
 ergoemacs-menus.el        |    2 +-
 ergoemacs-modal.el        |    8 ++++----
 ergoemacs-mode.el         |    6 +++---
 ergoemacs-shortcuts.el    |    8 ++++----
 ergoemacs-test.el         |    2 +-
 ergoemacs-theme-engine.el |    8 ++++----
 ergoemacs-themes.el       |    2 +-
 ergoemacs-track.el        |    2 +-
 ergoemacs-translate.el    |    8 ++++----
 ergoemacs-unbind.el       |    2 +-
 15 files changed, 28 insertions(+), 29 deletions(-)