diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2015-06-26 11:36:19 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2015-06-26 11:39:39 +0800 |
| commit | 37b4861cb01bf6bd9da41aa1b311a87b0d26fc25 (patch) | |
| tree | 3330d1958b04c9923de090273a4c0be4ee36e577 /ui/ncurses/Makefile.am | |
| parent | 83a3159f19f237fa994d2c0a16f97f711d02472c (diff) | |
| parent | 7df003a0d222ae08bff62de4fefff1cf56628123 (diff) | |
| download | talos-petitboot-37b4861cb01bf6bd9da41aa1b311a87b0d26fc25.tar.gz talos-petitboot-37b4861cb01bf6bd9da41aa1b311a87b0d26fc25.zip | |
Merge remote-tracking rbanch sammj/master
Conflicts:
discover/platform-powerpc.c
discover/ipmi.h
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'ui/ncurses/Makefile.am')
| -rw-r--r-- | ui/ncurses/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/ncurses/Makefile.am b/ui/ncurses/Makefile.am index 9a4e1e4..265ae69 100644 --- a/ui/ncurses/Makefile.am +++ b/ui/ncurses/Makefile.am @@ -47,7 +47,9 @@ ui_ncurses_libpbnc_la_SOURCES = \ ui/ncurses/nc-widgets.h \ ui/ncurses/nc-add-url.c \ ui/ncurses/nc-add-url.h \ - ui/ncurses/nc-add-url-help.c + ui/ncurses/nc-add-url-help.c \ + ui/ncurses/nc-subset.c \ + ui/ncurses/nc-subset.h sbin_PROGRAMS += ui/ncurses/petitboot-nc |
