diff options
author | Mark H Weaver <mhw@netris.org> | 2015-10-23 23:11:38 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2015-10-23 23:11:38 -0400 |
commit | d3365d486636b36c95ce17deefbc169f3d4f0e9a (patch) | |
tree | 9dfad056c14d203d8f6aab1f7310a3e4a3484e00 /Makefile.am | |
parent | 6e4512c470c7196ae19f8166c7ec2d176f87d7af (diff) | |
parent | ca9745e484474f27d5773059a063c0d8e70f7e1d (diff) | |
download | guix-d3365d486636b36c95ce17deefbc169f3d4f0e9a.tar.gz |
Merge branch 'master' into dbus-update
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 6f785e7083..1427203fb2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,6 +48,7 @@ MODULES = \ guix/nar.scm \ guix/derivations.scm \ guix/gnu-maintenance.scm \ + guix/upstream.scm \ guix/licenses.scm \ guix/build-system.scm \ guix/build-system/cmake.scm \ |