From 6811ac91f21a434fc7d967c11e1b20f33918c6ea Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 19 Mar 2012 22:07:29 -0400
Subject: v3: 3.2 branch is main (v3dv --> v3); dev (v3dv) branch directories
 removed

* v3dv (3.2) "merged" into v3 (previously 3.1) (& removed)
  * conf/sisu/v3dv --> conf/sisu/v3
  * data/sisu/v3dv --> data/sisu/v3
  * lib/sisu/v3dv  --> lib/sisu/v3
  * bin/sisu* (v3dv references changed to v3)
  * (--dev modifier (superfluous for the time being) runs main v3 branch)
---
 bin/sisu           | 2 +-
 bin/sisu2          | 2 +-
 bin/sisu3          | 2 +-
 bin/sisu_termsheet | 2 +-
 bin/sisu_webrick   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'bin')

diff --git a/bin/sisu b/bin/sisu
index a7440f9f..c95fa9f9 100644
--- a/bin/sisu
+++ b/bin/sisu
@@ -53,7 +53,7 @@ WOK
     'v3'
   when /--dev/
     check_sisu_dev_ruby_version?
-    'v3dv'
+    'v3' #'v3dv'
   else
     check_sisu_stable_ruby_version?
     'v3'
diff --git a/bin/sisu2 b/bin/sisu2
index 95c3c818..7b984a8e 100644
--- a/bin/sisu2
+++ b/bin/sisu2
@@ -53,7 +53,7 @@ WOK
     'v3'
   when /--dev/
     check_sisu_dev_ruby_version?
-    'v3dv'
+    'v3' #'v3dv'
   else
     check_sisu_legacy_ruby_version?
     'v2'
diff --git a/bin/sisu3 b/bin/sisu3
index a7440f9f..c95fa9f9 100644
--- a/bin/sisu3
+++ b/bin/sisu3
@@ -53,7 +53,7 @@ WOK
     'v3'
   when /--dev/
     check_sisu_dev_ruby_version?
-    'v3dv'
+    'v3' #'v3dv'
   else
     check_sisu_stable_ruby_version?
     'v3'
diff --git a/bin/sisu_termsheet b/bin/sisu_termsheet
index 11e042ef..46608c72 100644
--- a/bin/sisu_termsheet
+++ b/bin/sisu_termsheet
@@ -52,7 +52,7 @@ WOK
     'v3'
   when /--dev/
     check_sisu_dev_ruby_version?
-    'v3dv'
+    'v3' #'v3dv'
   else
     check_sisu_stable_ruby_version?
     'v3'
diff --git a/bin/sisu_webrick b/bin/sisu_webrick
index 65b6a061..5bd56108 100644
--- a/bin/sisu_webrick
+++ b/bin/sisu_webrick
@@ -52,7 +52,7 @@ WOK
     'v3'
   when /--dev/
     check_sisu_dev_ruby_version?
-    'v3dv'
+    'v3' #'v3dv'
   else
     check_sisu_stable_ruby_version?
     'v3'
-- 
cgit v1.2.3