diff options
| author | Camil Staps | 2015-06-04 22:46:47 +0200 |
|---|---|---|
| committer | Camil Staps | 2015-06-04 22:46:47 +0200 |
| commit | 58cbc308cedc5723d2e74e3855b541d07bcbf9bf (patch) | |
| tree | 2da5a441b6330056d099a9247353e829b1215dea /Week15 Mandelbrot/src | |
| 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')
| -rw-r--r-- | Week15 Mandelbrot/src/com/camilstaps/mandelbrot/MandelbrotController.java | 2 | ||||
| -rw-r--r-- | Week15 Mandelbrot/src/com/camilstaps/mandelbrot/MandelbrotWindow.java | 4 |
2 files changed, 5 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) { diff --git a/Week15 Mandelbrot/src/com/camilstaps/mandelbrot/MandelbrotWindow.java b/Week15 Mandelbrot/src/com/camilstaps/mandelbrot/MandelbrotWindow.java index 225347a..74ef8fc 100644 --- a/Week15 Mandelbrot/src/com/camilstaps/mandelbrot/MandelbrotWindow.java +++ b/Week15 Mandelbrot/src/com/camilstaps/mandelbrot/MandelbrotWindow.java @@ -1,4 +1,5 @@ /* +<<<<<<< HEAD * The MIT License (MIT) * * Copyright (c) 2015 Camil Staps <info@camilstaps.nl> @@ -20,6 +21,9 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. +======= + * Copyright (c) 2015 Camil Staps +>>>>>>> 85751141b5705dba503b507ab34cc4ee734a9e6a */ package com.camilstaps.mandelbrot; |