Changeset bc73be3 in mainline for uspace/app/bdsh/Makefile


Ignore:
Timestamp:
2019-06-27T08:51:20Z (7 years ago)
Author:
Jaroslav Jindrak <dzejrou@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8add15e0
Parents:
ad40b74b (diff), aeba767 (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.
Message:

cpp: merge and resolve conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/bdsh/Makefile

    rad40b74b rbc73be3  
    3434
    3535SOURCES = \
     36        cmds/modules/module_aliases.c \
     37        cmds/modules/modules.c \
    3638        cmds/modules/help/help.c \
    3739        cmds/modules/mkdir/mkdir.c \
    … …  
    5153        cmds/modules/kcon/kcon.c \
    5254        cmds/modules/cmp/cmp.c \
     55        cmds/builtins/builtin_aliases.c \
     56        cmds/builtins/builtins.c \
    5357        cmds/builtins/batch/batch.c \
    5458        cmds/builtins/exit/exit.c \
Note: See TracChangeset for help on using the changeset viewer.