Merge branch 'master' of git.unistra.fr:ukhanov/P4z

TP1/tris.h

-#ifndef TRIS_H
-#define TRIS_H
-#include <stdint.h>
-#include <stdlib.h>
-
-void triInsertion(long* A, size_t n);
-
-void triFusion(long* A, size_t size);
-void sousTriFusion(long* A, size_t first, size_t size);
-void fusion(long* A, size_t first, size_t middle, size_t size);
-
-void triRapide(long* A, size_t n);
-void sousTriRapide(long* A, size_t first, size_t size);
-size_t partition(long* A, size_t first, size_t size);
-void permuter(long* A,size_t i,size_t j);
-
-#endif //TRIS_H
+#ifndef TRIS_H
+#define TRIS_H
+#include <stdint.h>
+#include <stdlib.h>
+
+void triInsertion(long* A, size_t n);
+
+void triFusion(long* A, size_t size);
+void sousTriFusion(long* A, size_t first, size_t size);
+void fusion(long* A, size_t first, size_t middle, size_t size);
+
+void triRapide(long* A, size_t n);
+void sousTriRapide(long* A, size_t first, size_t size);
+size_t partition(long* A, size_t first, size_t size);
+void permuter(long* A,size_t i,size_t j);
+
+#endif //TRIS_H

main.c

-#include <stdio.h>
-
-int main( int argc, const char* argv[] )
-{
-    
-}