Changeset bc73be3 in mainline for kernel/arch/sparc64/Makefile.inc


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

  • kernel/arch/sparc64/Makefile.inc

    rad40b74b rbc73be3  
    8282        arch/$(KARCH)/src/drivers/tick.c \
    8383        arch/$(KARCH)/src/drivers/kbd.c \
     84        arch/$(KARCH)/src/drivers/tty.c \
    8485        arch/$(KARCH)/src/drivers/pci.c \
    8586        arch/$(KARCH)/src/trap/$(USARCH)/interrupt.c
Note: See TracChangeset for help on using the changeset viewer.