Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
# Conflicts:
# build-aux/Makefile.once.head/20-systemd.mk
# build-aux/Makefile.once.tail/20-systemd.mk
# config.mk.in
# src/libbasic/Makefile
# src/libshared/Makefile
# src/libsystemd/libsystemd-internal/Makefile
|
|
|
|
# Conflicts:
# am-pretty.mk
# config.mk.in
# src/journal/Makefile
# src/kernel-install/Makefile
# src/libbasic/Makefile
# src/libfirewall/Makefile
# src/libshared/Makefile
# src/libsystemd/Makefile
# src/libsystemd/libsystemd-internal/Makefile
# src/libsystemd/libsystemd-journal-internal/Makefile
# src/libsystemd/src/Makefile
# src/systemd-nspawn/Makefile
# src/systemd-nspawn/nspawn-network.c
# src/udev/udev.h
|
|
|
|
|
|
|
|
# Conflicts:
# src/libshared/Makefile
|
|
|
|
|
|
|