Merge remote-tracking branch 'origin/master' into bool-cleanup

Conflicts:
	src/options.js
This commit is contained in:
Jürg Lehni 2014-02-24 12:15:38 +01:00
commit 94090d144f

View file

@ -18,7 +18,7 @@ test('Decomposition: rotate()', function() {
equals(m.getRotation(), Base.pick(ea, a),
s + '.getRotation()',
Numerical.TOLERANCE);
equals(m.getScaling(), new Point(1, 1),
comparePoints(m.getScaling(), new Point(1, 1),
s + '.getScaling()');
}