Changeset 3e828ea in mainline for uspace/app/bdsh/cmds/modules/modules.c

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• uspace/app/bdsh/cmds/modules/modules.c (modified) (2 diffs)

uspace/app/bdsh/cmds/modules/modules.c

@@ -63 +63 @@
 #include "echo/entry.h"
 #include "cmp/entry.h"
+#include "alias/entry.h"
+#include "unalias/entry.h"
 
 /*
@@ -88 +90 @@
 #include "echo/echo_def.inc"
 #include "cmp/cmp_def.inc"
+#include "alias/alias_def.inc"
+#include "unalias/unalias_def.inc"
 
         { NULL, NULL, NULL, NULL }