touching frozen master as part of merge resolution

This commit is contained in:
rusefi 2017-03-29 08:59:24 -04:00
parent 5fd3769bc8
commit 4630767d49
1 changed files with 2 additions and 2 deletions

View File

@ -5,8 +5,8 @@ UTILSRC = $(PROJECT_DIR)/util/crc.c \
$(PROJECT_DIR)/util/histogram.c
UTILSRC_CPP = $(PROJECT_DIR)/util/cyclic_buffer.cpp \
$(PROJECT_DIR)/console/datalogging.cpp \
$(PROJECT_DIR)/console/loggingcentral.cpp \
$(PROJECT_DIR)/util/datalogging.cpp \
$(PROJECT_DIR)/util/loggingcentral.cpp \
$(PROJECT_DIR)/util/listener_array.cpp \
$(PROJECT_DIR)/util/cli_registry.cpp \
$(PROJECT_DIR)/util/efilib.cpp \