「🗑️」 clean: cleaned rebase shit

2024-11-09 15:50:43 +01:00
parent beb114f49d
commit cc55d39764
9 changed files with 3 additions and 3 deletions
--- a/ea_texture.png
+++ b/ea_texture.png
--- a/leflo.png
+++ b/leflo.png
--- a/maps/w_form_img.cub
+++ b/maps/w_form_img.cub
@ -1,5 +1,5 @@
 NO ./img/flo.png			
-SO ./img/jpeg.jpeg
+SO ./img/jpg.jpg

 WE ./img/cahuete.png
 EA ./img/kanel.png
--- a/maps/w_noperm_img.cub
+++ b/maps/w_noperm_img.cub
@ -1,5 +1,5 @@

-NO ./img/noperm.png			
+NO ./img/no_perm.png			
 SO ./img/suki.png

 WE ./img/cahuete.png
--- a/no_texture.png
+++ b/no_texture.png
--- a/so_texture.png
+++ b/so_texture.png
--- a/src/utils/convert_parsing.c
+++ b/src/utils/convert_parsing.c
@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/11/06 13:01:03 by adjoly            #+#    #+#             */
-/*   Updated: 2024/11/07 12:17:13 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/11/09 15:49:41 by madumerg         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */

--- a/tamere.jpeg
+++ b/tamere.jpeg
--- a/we_texture.png
+++ b/we_texture.png