diff options
author | Ludovic Courtès <ludo@gnu.org> | 2016-01-03 14:53:03 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2016-01-03 14:53:03 +0100 |
commit | 53334dd6e9e296e17110ebcd2b1f93f117ffe36a (patch) | |
tree | 2653db2eab9a204dab892ea8b6812cadf7209e84 /emacs.am | |
parent | 1575dcd134f4fae7255787293f4988bbd043de95 (diff) | |
parent | 51385362f76e2f823ac8d8cf720d06c386504069 (diff) | |
download | patches-53334dd6e9e296e17110ebcd2b1f93f117ffe36a.tar patches-53334dd6e9e296e17110ebcd2b1f93f117ffe36a.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'emacs.am')
-rw-r--r-- | emacs.am | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -22,14 +22,19 @@ ELFILES = \ emacs/guix-backend.el \ emacs/guix-base.el \ emacs/guix-build-log.el \ + emacs/guix-buffer.el \ emacs/guix-command.el \ emacs/guix-devel.el \ emacs/guix-emacs.el \ + emacs/guix-entry.el \ emacs/guix-external.el \ emacs/guix-geiser.el \ emacs/guix-guile.el \ emacs/guix-help-vars.el \ emacs/guix-history.el \ + emacs/guix-hydra.el \ + emacs/guix-hydra-build.el \ + emacs/guix-hydra-jobset.el \ emacs/guix-info.el \ emacs/guix-init.el \ emacs/guix-list.el \ @@ -39,8 +44,10 @@ ELFILES = \ emacs/guix-prettify.el \ emacs/guix-profiles.el \ emacs/guix-read.el \ - emacs/guix-utils.el \ - emacs/guix.el + emacs/guix-ui.el \ + emacs/guix-ui-package.el \ + emacs/guix-ui-generation.el \ + emacs/guix-utils.el if HAVE_EMACS |