Merge branch 'master' of ssh://vo20.nl/git/uva

5d2d6f63 · Sander Mathijs van Veen · 543db800 · 031631c4 · 5d2d6f63 · 5d2d6f63
Commit 5d2d6f63 authored Nov 08, 2010 by Sander Mathijs van Veen
Showing with 11 additions and 2 deletions

graphics/ass7/intersection.c graphics/ass7/intersection.c +1 -1

graphics/ass7/main graphics/ass7/main +0 -0

os/ass3/fishbones.c os/ass3/fishbones.c +7 -0

os/ass3/report/report.tex os/ass3/report/report.tex +3 -1

No files found.
--- a/graphics/ass7/intersection.c
+++ b/graphics/ass7/intersection.c
@@ -2,7 +2,7 @@
 *
 * Student name .... Sander van Veen & Taddeus Kroes
 * Student email ... sandervv@gmail.com & taddeuskroes@hotmail.com
- * Collegekaart .... ... & 6054129
+ * Collegekaart .... 6167969 & 6054129
 * Date ............ 07.11.2010
 */


--- a/graphics/ass7/main
+++ b/graphics/ass7/main
--- a/os/ass3/fishbones.c
+++ b/os/ass3/fishbones.c
+/*
+ * Student name .... Sander van Veen & Taddeus Kroes
+ * Student email ... sandervv@gmail.com & taddeuskroes@hotmail.com
+ * Collegekaart .... 6167969 & 6054129
+ * Date ............ 07.11.2010
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>

--- a/os/ass3/report/report.tex
+++ b/os/ass3/report/report.tex
@@ -33,7 +33,9 @@ breaklines=false
 \usetikzlibrary{shapes,arrows}

 \title{Operating systems opdracht 3: \\ ICP met fork/pipe}
-\author{Sander van Veen \& Tadde\"us Kroes}
+\author{Sander van Veen \& Tadde\"us Kroes \\
+        6167969 \& 6054129 \\
+		\url{sandervv@gmail.com} \& \url{taddeuskroes@hotmail.com} }

 \begin{document}