From 0346d1749c075222ec5291307d51cb51d3b768fc Mon Sep 17 00:00:00 2001
From: markpollack <mark.pollack@springsource.com>
Date: Thu, 17 Dec 2009 19:09:03 +0000
Subject: [PATCH] misc updates.

---
 build-support/install-schema.build                              | 2 +-
 .../installer/installaware/Spring.NET-1.3/Spring.NET-1.3.mpr    | 2 +-
 .../installaware/Spring.NET-1.3/Spring.NET-1.3.mpr.bak          | 2 +-
 changelog.txt                                                   | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/build-support/install-schema.build b/build-support/install-schema.build
index e9307e8b..ac8567ad 100644
--- a/build-support/install-schema.build
+++ b/build-support/install-schema.build
@@ -175,7 +175,7 @@
       <echo message="Copying spring-nms-1.3.xsd to ${vsXXXX.version} installation."/>
       <echo message="----------------------------------------------------------"/>
       <echo message=""/>
-      <copy file="spring-nms-1.3.xsd" todir="${vsXXXX.xml.schemas}${vsXXXX.relative.dir}" 
+      <copy file="spring-nms-1.3.xsd" todir="${vsXXXX.xml.schemas}${vsXXXX.relative.dir}" b
             verbose="true"
             overwrite="true"/>
 
diff --git a/build-support/installer/installaware/Spring.NET-1.3/Spring.NET-1.3.mpr b/build-support/installer/installaware/Spring.NET-1.3/Spring.NET-1.3.mpr
index 7651df82..59e0c54c 100644
--- a/build-support/installer/installaware/Spring.NET-1.3/Spring.NET-1.3.mpr
+++ b/build-support/installer/installaware/Spring.NET-1.3/Spring.NET-1.3.mpr
@@ -510,7 +510,7 @@ Spring for .NET 1.3.0
 Spring for .NET 1.3.0
 Spring for .NET authors
 All rights reserved
-{3B1A39E1-51CA-46B4-AF46-81D856E44EE7}
+{9E5397A5-B30D-4305-8F9E-D3FF94E158EE}
 Spring for .NET
 Spring for .NET
 http://forum.springframework.net
diff --git a/build-support/installer/installaware/Spring.NET-1.3/Spring.NET-1.3.mpr.bak b/build-support/installer/installaware/Spring.NET-1.3/Spring.NET-1.3.mpr.bak
index a1801332..7651df82 100644
--- a/build-support/installer/installaware/Spring.NET-1.3/Spring.NET-1.3.mpr.bak
+++ b/build-support/installer/installaware/Spring.NET-1.3/Spring.NET-1.3.mpr.bak
@@ -510,7 +510,7 @@ Spring for .NET 1.3.0
 Spring for .NET 1.3.0
 Spring for .NET authors
 All rights reserved
-{289B412D-9B6E-4E43-919A-22B2F083225F}
+{3B1A39E1-51CA-46B4-AF46-81D856E44EE7}
 Spring for .NET
 Spring for .NET
 http://forum.springframework.net
diff --git a/changelog.txt b/changelog.txt
index 3fb803e6..dc4c7bed 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -10,7 +10,6 @@ Bug
 [SPRNET-1155] - Error when evaluating expression with #date variable
 [SPRNET-1198] - Dynamic Assemblies are not Strong Named
 [SPRNET-1228] - NmsTemplate: wrong timeout units in receive method (ticks instead of milliseconds)
-[SPRNET-1253] - NmsTemplate: wrong timeout units in receive method (ticks instead of milliseconds)
 [SPRNET-1266] - Context creation can throw ObjectCurrentlyInCreatation exception thrown when using <tx:attribute-driven/> with NHibernateTransactionManager
 [SPRNET-1270] - Selection of DefaultProvider in MultiDelegatingDbProvider can be null
 [SPRNET-1272] - Recreating application context can result in calls to create same type twice leading to System.ArgumentException: Duplicate type name within an assembly.