Compare commits

...

6 Commits

Author SHA1 Message Date
ragaskar
41f496001f Version bump to 1.1.0 2011-09-10 13:51:11 -04:00
ragaskar
6b5956724b Version bump to rc4 2011-09-01 07:26:07 -04:00
Rajan Agaskar
ec24992250 Merge pull request #123 from Osukaru/master
fixed html comments in SpecRunner.html example
2011-09-01 04:23:41 -07:00
Osukaru
83f232237d fixed html comments 2011-08-26 01:22:11 +03:00
Rajan Agaskar
98d32bb4a4 Merge pull request #111 from qfox/patch-1
Add missing semi.
2011-07-21 04:07:52 -07:00
qfox
c4f27ae377 ASI trolling 2011-07-21 00:58:53 -07:00
6 changed files with 8 additions and 11 deletions

View File

@@ -10,11 +10,11 @@
<script type="text/javascript" src="lib/jasmine-1.1.0.rc1/jasmine.js"></script>
<script type="text/javascript" src="lib/jasmine-1.1.0.rc1/jasmine-html.js"></script>
<!-- include source files here... -->
<!-- include spec files here... -->
<script type="text/javascript" src="spec/SpecHelper.js"></script>
<script type="text/javascript" src="spec/PlayerSpec.js"></script>
<!-- include spec files here... -->
<!-- include source files here... -->
<script type="text/javascript" src="src/Player.js"></script>
<script type="text/javascript" src="src/Song.js"></script>

View File

@@ -742,7 +742,7 @@ jasmine.Env.prototype.versionString = function() {
var version = this.version();
var versionString = version.major + "." + version.minor + "." + version.build;
if (version.release_candidate) {
versionString += ".rc" + version.release_candidate
versionString += ".rc" + version.release_candidate;
}
versionString += " revision " + version.revision;
return versionString;
@@ -2472,6 +2472,5 @@ jasmine.version_= {
"major": 1,
"minor": 1,
"build": 0,
"revision": 1310556152,
"release_candidate": 3
"revision": 1315677058
};

View File

@@ -1,6 +1,6 @@
module Jasmine
module Core
VERSION = "1.1.0.rc3"
VERSION = "1.1.0"
end
end

View File

@@ -58,7 +58,7 @@ jasmine.Env.prototype.versionString = function() {
var version = this.version();
var versionString = version.major + "." + version.minor + "." + version.build;
if (version.release_candidate) {
versionString += ".rc" + version.release_candidate
versionString += ".rc" + version.release_candidate;
}
versionString += " revision " + version.revision;
return versionString;

View File

@@ -2,6 +2,5 @@ jasmine.version_= {
"major": 1,
"minor": 1,
"build": 0,
"revision": 1310556152,
"release_candidate": 3
"revision": 1315677058
};

View File

@@ -1,6 +1,5 @@
{
"major": 1,
"minor": 1,
"build": 0,
"release_candidate": 3
"build": 0
}