Merge remote-tracking branch 'upstream/master' into custom-dragBounds

Browse Source

Conflicts:
	dist/kinetic-core.js
	dist/kinetic-core.min.js
	src/Node.js

...

This commit is contained in:

David Johansson

2012-08-23 22:39:25 +02:00

parent 7530e6a098 1ad2530889

commit 923b4d9c91

29 changed files with 1425 additions and 1810 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1296

dist/kinetic-core.js vendored

File diff suppressed because it is too large Load Diff

6

dist/kinetic-core.min.js vendored

File diff suppressed because one or more lines are too long