From 79209c429705beb57ad9b787718856ab2c9fd37c Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Mon, 17 Mar 2008 20:55:21 +0000
Subject: Merged changes in Prebuild trunk up to r258 into OpenSim's Prebuild.
 Hopefully this should make merging upstream easier. Building with NAnt should
 still work, but Visual Studio is untested.

---
 Prebuild/src/Core/Utilities/CommandLineCollection.cs | 2 +-
 Prebuild/src/Core/Utilities/CurrentDirectory.cs      | 2 +-
 Prebuild/src/Core/Utilities/Helper.cs                | 2 +-
 Prebuild/src/Core/Utilities/Log.cs                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'Prebuild/src/Core/Utilities')

diff --git a/Prebuild/src/Core/Utilities/CommandLineCollection.cs b/Prebuild/src/Core/Utilities/CommandLineCollection.cs
index 62eb18b..5733547 100644
--- a/Prebuild/src/Core/Utilities/CommandLineCollection.cs
+++ b/Prebuild/src/Core/Utilities/CommandLineCollection.cs
@@ -27,7 +27,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 /*
  * $Source$
  * $Author: robloach $
- * $Date: 2006-09-26 00:30:53 +0200 (ti, 26 sep 2006) $
+ * $Date: 2006-09-26 07:30:53 +0900 (Tue, 26 Sep 2006) $
  * $Revision: 165 $
  */
 #endregion
diff --git a/Prebuild/src/Core/Utilities/CurrentDirectory.cs b/Prebuild/src/Core/Utilities/CurrentDirectory.cs
index ff2d159..abbed52 100644
--- a/Prebuild/src/Core/Utilities/CurrentDirectory.cs
+++ b/Prebuild/src/Core/Utilities/CurrentDirectory.cs
@@ -27,7 +27,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 /*
  * $Source$
  * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Date: 2006-01-28 09:49:58 +0900 (Sat, 28 Jan 2006) $
  * $Revision: 71 $
  */
 #endregion
diff --git a/Prebuild/src/Core/Utilities/Helper.cs b/Prebuild/src/Core/Utilities/Helper.cs
index 27b9ccf..19093ce 100644
--- a/Prebuild/src/Core/Utilities/Helper.cs
+++ b/Prebuild/src/Core/Utilities/Helper.cs
@@ -27,7 +27,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 /*
  * $Source$
  * $Author: jendave $
- * $Date: 2007-02-13 21:58:03 +0100 (ti, 13 feb 2007) $
+ * $Date: 2007-02-14 05:58:03 +0900 (Wed, 14 Feb 2007) $
  * $Revision: 205 $
  */
 #endregion
diff --git a/Prebuild/src/Core/Utilities/Log.cs b/Prebuild/src/Core/Utilities/Log.cs
index 2f26557..e8105ac 100644
--- a/Prebuild/src/Core/Utilities/Log.cs
+++ b/Prebuild/src/Core/Utilities/Log.cs
@@ -27,7 +27,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 /*
  * $Source$
  * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Date: 2006-01-28 09:49:58 +0900 (Sat, 28 Jan 2006) $
  * $Revision: 71 $
  */
 #endregion
-- 
cgit v1.1