Merge branch 'refs/heads/master' into v8-optimizations

Conflicts:
	src/core/Base.js
	src/style/Color.js
This commit is contained in:
Jürg Lehni 2014-01-05 05:01:13 +01:00
commit ea63d4c288
118 changed files with 498 additions and 462 deletions
src/basic

View file

@ -2,8 +2,8 @@
* Paper.js - The Swiss Army Knife of Vector Graphics Scripting.
* http://paperjs.org/
*
* Copyright (c) 2011 - 2013, Juerg Lehni & Jonathan Puckey
* http://lehni.org/ & http://jonathanpuckey.com/
* Copyright (c) 2011 - 2014, Juerg Lehni & Jonathan Puckey
* http://scratchdisk.com/ & http://jonathanpuckey.com/
*
* Distributed under the MIT license. See LICENSE file for details.
*