From: Mart Lubbers <mart@martlubbers.net>
Date: Mon, 9 Feb 2015 15:01:54 +0000 (+0100)
Subject: Merge branch 'master' of github.com:dopefishh/sws1
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=6701ca4685643301d05a420df9064d9c0f531301;p=sws1-1415.git

Merge branch 'master' of github.com:dopefishh/sws1

Conflicts:
	ass2/mart/sws1-s4109503-s4202015/exercise1d
	ass2/mart/sws1-s4109503-s4202015/exercise1d.c
---

6701ca4685643301d05a420df9064d9c0f531301
diff --cc ass2/mart/sws1-s4109503-s4202015/exercise1d.c
index 93dba64,3200729..7555bc9
--- a/ass2/mart/sws1-s4109503-s4202015/exercise1d.c
+++ b/ass2/mart/sws1-s4109503-s4202015/exercise1d.c
@@@ -1,6 -1,5 +1,5 @@@
 -#include <stdint.h>
 +#include <inttypes.h>
  #include <stdio.h>
- #include <stdlib.h>
  
  int main(void)
  {