merge

2011-06-20 08:46:37 -07:00
parent b640ce6fc0 e9af7834f5
commit c0664dd6aa
32 changed files with 16189 additions and 141 deletions
--- a/src/templates/version.erb
+++ b/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 %>
 };