Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 91f72287 authored by PRATS Tommy's avatar PRATS Tommy
Browse files

Merge remote-tracking branch 'refs/remotes/origin/main' into dev/tommy/test_auto 

# Conflicts:
#	engine_evolution.org
#	engines/action.c
#	engines/entity.c
#	engines/entity.h
#	engines/inventory.c
#	engines/map.c
#	engines/tests/read_map_str/tests.c
#	levels/basic/holy_grail/level.py
#	lib/graphic/views/game.py
#	tests/testLevels.py
parents b3f78fb6 72c34ae7
No related branches found
No related tags found
4 merge requests!131Testing merge against main, to verify CI,!97Engines have test and no leak of memory,!95Enhance Makefile,!94auto export python path when running make tests
Hide whitespace changes
Inline Side-by-side
Showing
with 438 additions and 382 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment