Merge branch 'dev' into dev2

2020-01-28 13:42:03 +01:00
parent 25c4b28f4c 4a534c8156
commit ce15b661f3
8 changed files with 154 additions and 116 deletions
--- a/libft/Makefile
+++ b/libft/Makefile
@@ -6,7 +6,7 @@
 #    By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2018/04/07 12:47:06 by tmaze             #+#    #+#              #
-#    Updated: 2019/12/06 09:59:05 by tmaze            ###   ########.fr        #
+#    Updated: 2020/01/25 16:24:08 by tmaze            ###   ########.fr        #
 #                                                                              #
 #******************************************************************************#