merge
This commit is contained in:
@@ -56,11 +56,12 @@ jasmine.Env.prototype.versionString = function() {
|
||||
}
|
||||
|
||||
var version = this.version();
|
||||
var dotted_version = version.major + "." + version.minor + "." + version.build;
|
||||
if (version.rc) {
|
||||
dotted_version += ".rc" + version.rc;
|
||||
var versionString = version.major + "." + version.minor + "." + version.build;
|
||||
if (version.release_candidate) {
|
||||
versionString += ".rc" + version.release_candidate
|
||||
}
|
||||
return dotted_version + " revision " + version.revision;
|
||||
versionString += " revision " + version.revision;
|
||||
return versionString;
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user