diff DynArray.c @ 29:3c2345880bbe

merge failed subrepo commit
author Nina Engelhardt <nengel@mailbox.tu-berlin.de>
date Mon, 17 Sep 2012 11:19:01 +0200
parents ba7abed0873c 4f386058d46c
children
line diff
     1.1 --- a/DynArray.c	Mon Sep 17 11:07:07 2012 +0200
     1.2 +++ b/DynArray.c	Mon Sep 17 11:19:01 2012 +0200
     1.3 @@ -7,7 +7,7 @@
     1.4  
     1.5  
     1.6  #include <stdio.h>
     1.7 -#include <stdlib.h>
     1.8 +#include <malloc.h>
     1.9  
    1.10  #include "DynArray.h"
    1.11