slackersoft ba0982d89f Merge branch 'beforeAll' into master ...

Conflicts:
	lib/jasmine-core/boot.js
	lib/jasmine-core/boot/boot.js
	lib/jasmine-core/jasmine.css
	lib/jasmine-core/jasmine.js
	spec/core/SpecSpec.js
	spec/core/SuiteSpec.js
	spec/core/integration/EnvSpec.js
	spec/node_suite.js
	src/core/Env.js
	src/core/requireCore.js
	src/core/util.js

2014-09-24 20:20:39 -07:00

..

console

Merge branch 'beforeAll' into master

2014-09-24 20:20:39 -07:00

core

Merge branch 'beforeAll' into master

2014-09-24 20:20:39 -07:00

helpers

- Add a main entry point for the jasmine-core npm

2014-03-21 17:21:52 -07:00

html

Merge branch 'beforeAll' into master

2014-09-24 20:20:39 -07:00

javascripts/support

Move selenium_runner.yml to spec/javascripts/support

2013-10-02 16:48:13 -07:00

npmPackage

Add some tests to make sure we're packaging up the npm properly

2014-08-26 08:08:04 -07:00

performance

Refactor prettyPrinter to work with immutable objects

2014-03-12 11:41:18 -07:00

support

Don't run npm package specs in browsers

2014-08-26 13:18:16 -07:00

node_suite.js

- Add a main entry point for the jasmine-core npm

2014-03-21 17:21:52 -07:00