Merge branch 'master' into BetterTerm

2019-03-25 23:22:23 +01:00 · 2019-03-25 23:22:23 +01:00 · de2a3ca9f9
parent bc8970c2d0 c7197dc808
commit de2a3ca9f9
2 changed files with 2 additions and 3 deletions
--- a/1
+++ b/1
@ -175,6 +175,7 @@ $(KOBJDIR)/kernel/sched.o: $(KERNELDIR)/kernel/proc/sched.c $(KERNELDIR)/include
 	@$(KCC) $< -o $@
 	@echo ${CL2}[$@] ${CL}Compiled.${CL3}

+
 ## MISC MAKEFILE ------------------------------------------------------------- #
 ./ProjectTree: ./.stylehlp_sh
 	@cat ./.stylehlp_sh > ./ProjectTree
--- a/kaleid/kernel/buf/buf.c
+++ b/kaleid/kernel/buf/buf.c
@ -140,5 +140,3 @@ error_t BFlushBuf(Buffer_t *buf)

    return rc;
 }
-
-