Merge remote-tracking branch 'origin/master'

Conflicts: BuitenTemperatuur.java
2014-10-09 09:31:21 +02:00
parent 54407c0519 05fb5c0800
commit 92da47a4d5
7 changed files with 51 additions and 58 deletions
@@ -1,4 +1,8 @@
 
+<<<<<<< HEAD
+=======
+ 
+>>>>>>> origin/master
 import java.io.*;
 import java.net.*;
 import java.util.ArrayList;
@@ -82,5 +86,6 @@ public class BuitenTemperatuur
        GUIboard.writeUpperDigits(temp);
        GUIboard.writeLeftDigits(max);
        GUIboard.writeRightDigits(min);
+        GUIboard.writePageToMatrix("Buitentemperatuur", "Gemiddelde: " + avg, "");
    }
 }