diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-16 20:09:46 -0400 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-16 20:09:46 -0400 |
commit | 93f767e26de82d1d4133e719a758578ede98b306 (patch) | |
tree | 0932ef3730d627bb9d9fc6c919cdcd5a6a358d7f /tools/bin2c | |
parent | dd7e19107879f74d8f962a6a47d619470eaefbcd (diff) | |
parent | e50b9e28bc0d98c69b22f6d13298e705eb4eb865 (diff) |
resolve conflict
Diffstat (limited to 'tools/bin2c')
-rw-r--r-- | tools/bin2c/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/bin2c/Makefile b/tools/bin2c/Makefile index bd5f60490..4cc23a25a 100644 --- a/tools/bin2c/Makefile +++ b/tools/bin2c/Makefile @@ -1,6 +1,6 @@ CC = gcc -CFLAGS = -Wall -Wextra -std=c11 -O2 -s +CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -s .PHONY: clean |