diff options
| author | Carlo Zancanaro <carlo@pc-4w14-0.cs.usyd.edu.au> | 2012-11-02 11:06:41 +1100 |
|---|---|---|
| committer | Carlo Zancanaro <carlo@pc-4w14-0.cs.usyd.edu.au> | 2012-11-02 11:06:41 +1100 |
| commit | ea660a9528cea35b7971dfc405e464cbddb2d1d0 (patch) | |
| tree | c1989f3d1bd79ac8325326f00ba3cb321f0a3911 /impl/test/1.eqns | |
| parent | a8472ef1867418b94116324531b3587e0e0e7363 (diff) | |
| parent | 1c3d68659fb6341e7a72d563448380a7ffae8c2e (diff) | |
Merge branch 'master' of ssh://bitbucket.org/czan/honours
Conflicts:
tex/thesis/contribution/contribution.tex
Diffstat (limited to 'impl/test/1.eqns')
| -rw-r--r-- | impl/test/1.eqns | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/impl/test/1.eqns b/impl/test/1.eqns index 0cdfd24..34c51de 100644 --- a/impl/test/1.eqns +++ b/impl/test/1.eqns @@ -1,3 +1,3 @@ -x = max(0, min(-1 + x, y)) y = max(0, 5 + x, x) z = max(0, 1 + z, 0 + x) +x = max(0, min(-1 + x, y)) |