merge

src/core/Env.js

@@ -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;
 };
 
 /**

src/templates/version.erb

@@ -2,5 +2,5 @@ jasmine.version_= {
   "major": <%= major %>,
   "minor": <%= minor %>,
   "build": <%= build %>,
-  "revision": <%= revision %><%= %Q{,\n  "rc": #{rc}} if rc %>
+  "revision": <%= revision %><%= %Q{,\n  "rc": #{release_candidate}} if release_candidate %>
 };

src/version.js

@@ -2,6 +2,6 @@ jasmine.version_= {
   "major": 1,
   "minor": 1,
   "build": 0,
-  "revision": 1308359945,
+  "revision": 1308584756,
   "rc": 1
 };

src/version.json

@@ -2,5 +2,5 @@
   "major": 1,
   "minor": 1,
   "build": 0,
-  "rc": 1
+  "release_candidate": 1
 }