Aron Carroll 190e38cef7 Merge branch master into feature/node ...

Removing a number of files that are no longer in the feature/node
branch. Don't shoot me if something goes missing.

Conflicts:
	VERSION
	js/editors/libraries.js
	js/editors/library.js
	js/render/live.js
	js/render/render.js

2012-07-20 16:18:56 +01:00

..

editors

Merge branch master into feature/node

2012-07-20 16:18:56 +01:00

render

Merge branch master into feature/node

2012-07-20 16:18:56 +01:00