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/Parse/IfContext.cs    | 2 +-
 Prebuild/src/Core/Parse/Preprocessor.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/Prebuild/src/Core/Parse/IfContext.cs b/Prebuild/src/Core/Parse/IfContext.cs
index 6311f47..fc86885 100644
--- a/Prebuild/src/Core/Parse/IfContext.cs
+++ b/Prebuild/src/Core/Parse/IfContext.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/Parse/Preprocessor.cs b/Prebuild/src/Core/Parse/Preprocessor.cs
index af21090..eea5c30 100644
--- a/Prebuild/src/Core/Parse/Preprocessor.cs
+++ b/Prebuild/src/Core/Parse/Preprocessor.cs
@@ -27,8 +27,8 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 /*
  * $Source$
  * $Author: jendave $
- * $Date: 2006-09-01 19:55:06 +0200 (fr, 01 sep 2006) $
- * $Revision: 147 $
+ * $Date: 2007-04-26 17:10:27 +0900 (Thu, 26 Apr 2007) $
+ * $Revision: 236 $
  */
 #endregion
 
-- 
cgit v1.1