diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-02-27 23:49:30 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-02-27 23:49:30 +0100 |
| commit | 829ecd002e70682d11a22e26a7fe7e87248a8fec (patch) | |
| tree | 0e44e654b30809882b2b1a7a9f5a67d23bb2bd3e /gnu-system.am | |
| parent | 3bb33e24bb495d78e6be663b5763245a1d63bc90 (diff) | |
| parent | 65f7c35d02175806f676b8e130236dd3e6c8ec60 (diff) | |
| download | patches-829ecd002e70682d11a22e26a7fe7e87248a8fec.tar patches-829ecd002e70682d11a22e26a7fe7e87248a8fec.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/libwebsockets.scm
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu-system.am b/gnu-system.am index 29103f9360..b5be893854 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -132,7 +132,6 @@ GNU_SYSTEM_MODULES = \ gnu/packages/libunistring.scm \ gnu/packages/libusb.scm \ gnu/packages/libunwind.scm \ - gnu/packages/libwebsockets.scm \ gnu/packages/lightning.scm \ gnu/packages/linux.scm \ gnu/packages/lout.scm \ @@ -146,6 +145,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/maths.scm \ gnu/packages/mit-krb5.scm \ gnu/packages/moe.scm \ + gnu/packages/mpd.scm \ gnu/packages/mp3.scm \ gnu/packages/multiprecision.scm \ gnu/packages/mtools.scm \ @@ -206,6 +206,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/tor.scm \ gnu/packages/uucp.scm \ gnu/packages/unrtf.scm \ + gnu/packages/upnp.scm \ gnu/packages/valgrind.scm \ gnu/packages/version-control.scm \ gnu/packages/video.scm \ |