Merge branch 'master' into develop

This commit is contained in:
jos 2015-02-20 09:44:45 +01:00
commit f3ed387a10

View File

@ -463,7 +463,7 @@ with an entry for every visible statement.
```js
// a multi line expression
math.eval('1 * 3 \n 2 * 3 \n 3 * 3'); // ResultSet, [1, 3, 9]
math.eval('1 * 3 \n 2 * 3 \n 3 * 3'); // ResultSet, [3, 6, 9]
// semicolon statements are hided from the output
math.eval('a=3; b=4; a + b \n a * b'); // ResultSet, [7, 12]
@ -517,4 +517,4 @@ parser.eval('# define some variables');
parser.eval('width = 3'); // 3
parser.eval('height = 4'); // 4
parser.eval('width * height # calculate the area'); // 12
```
```