tvdu29/libft
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.cloud.arnaud-pc.fr/tvdu29/libft

Browse Source
This commit is contained in:
Tanguy MAZE
2019-03-23 17:21:58 +01:00
parent 9f04f49de6 f798c9ce1d
commit 05a6363b5d
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -6,7 +6,7 @@
# By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2018/04/07 12:47:06 by tmaze #+# #+# #
# Updated: 2019/03/23 16:26:19 by tmaze ### ########.fr #
# Updated: 2019/03/23 17:18:32 by tmaze ### ########.fr #
# #
#******************************************************************************#
@@ -16,6 +16,7 @@ CCSTD =
NAME = libft.a
<<<<<<< HEAD
SRCS = ft_memalloc.c \
ft_memdel.c \
ft_memset.c \