Commit 4a767733 authored by pernelle's avatar pernelle

Merge tag '2020.1.2' into develop

Finish 2020.1.2
parents 488d967b abf9b039
......@@ -19,7 +19,7 @@
#include <unistd.h>
#include "communCOL3-TP2.h"
const int MATERIAUX_BALISTE[2][6]={{10,5,2,3,1,4},{10,5,2,3,1,4}};
const int MATERIAUX_BALISTE[2][6]={{5,2,1,1,1,2},{9,3,3,2,3,2}};
/**
cette fonction lit une structure (armee) sur la socket (sock) et
......
Markdown is supported
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