xian ab65914233 Merge branch 'master' of git@github.com:emi/jasmine into htmlreporter ... Conflicts: lib/TrivialReporter.js spec/bootstrap.js spec/runner.html		2009-08-14 18:03:47 -07:00
..
TrivialReporter.js	remove a leftover call to "console.log"	2009-08-12 16:12:57 -07:00
example_suite.html	Re-arranged files so that lib represents a standalone drop-in of Jasmine. Killed JSON reporter because it has been succeeded by TrivialReporter.js. Using mock-timeout in src for mock-timeout functionality (instead of maintaining two copies	2009-06-24 07:44:40 -07:00
example_suite.js	Re-arranged files so that lib represents a standalone drop-in of Jasmine. Killed JSON reporter because it has been succeeded by TrivialReporter.js. Using mock-timeout in src for mock-timeout functionality (instead of maintaining two copies	2009-06-24 07:44:40 -07:00
jasmine.css	added failure count to top of trivial reporter	2009-08-12 10:15:15 -07:00
jasmine.js	Merge branch 'master' of git@github.com:emi/jasmine into htmlreporter	2009-08-14 18:03:47 -07:00
json2.js	Re-arranged files so that lib represents a standalone drop-in of Jasmine. Killed JSON reporter because it has been succeeded by TrivialReporter.js. Using mock-timeout in src for mock-timeout functionality (instead of maintaining two copies	2009-06-24 07:44:40 -07:00