diff options
| author | Camil Staps | 2015-06-04 22:46:47 +0200 |
|---|---|---|
| committer | Camil Staps | 2015-06-04 22:47:49 +0200 |
| commit | 84a092d5e17694dabae7a2d519fcd446de4ce5d6 (patch) | |
| tree | 20330e18a12d53397e1935b3eb7da045b73ff5eb /Week15 Mandelbrot/src/com/camilstaps/mandelbrot | |
| parent | Started own version (diff) | |
| parent | Started own version (diff) | |
Merge branch 'master' of github:camilstaps/OO1415
Conflicts:
Week15 Mandelbrot/src/com/camilstaps/mandelbrot/DrawView.java
Week15 Mandelbrot/src/com/camilstaps/mandelbrot/FractalModel.java
Week15 Mandelbrot/src/com/camilstaps/mandelbrot/MandelbrotController.java
Week15 Mandelbrot/src/com/camilstaps/mandelbrot/MandelbrotFractal.java
Week15 Mandelbrot/src/com/camilstaps/mandelbrot/MandelbrotWindow.java
Diffstat (limited to 'Week15 Mandelbrot/src/com/camilstaps/mandelbrot')
| -rw-r--r-- | Week15 Mandelbrot/src/com/camilstaps/mandelbrot/MandelbrotController.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Week15 Mandelbrot/src/com/camilstaps/mandelbrot/MandelbrotController.java b/Week15 Mandelbrot/src/com/camilstaps/mandelbrot/MandelbrotController.java index c65d99d..adca194 100644 --- a/Week15 Mandelbrot/src/com/camilstaps/mandelbrot/MandelbrotController.java +++ b/Week15 Mandelbrot/src/com/camilstaps/mandelbrot/MandelbrotController.java @@ -8,7 +8,7 @@ package com.camilstaps.mandelbrot; * @author camilstaps */ public class MandelbrotController { - + private final MandelbrotFractal fractal; public MandelbrotController(MandelbrotFractal fractal) { |