From: <aye...@us...> - 2009-10-18 01:14:44
|
Revision: 4771 http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4771&view=rev Author: ayenderahien Date: 2009-10-18 01:14:34 +0000 (Sun, 18 Oct 2009) Log Message: ----------- Just recording the previous merge Property Changed: ---------------- branches/2.1.x/nhibernate/ branches/2.1.x/nhibernate/src/NHibernate/ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Customer.cs branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Fixture.cs branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Mappings.hbm.xml branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1927/ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1928/ branches/2.1.x/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests/ branches/2.1.x/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests/WithColumnTag.hbm.xml Property changes on: branches/2.1.x/nhibernate ___________________________________________________________________ Added: svn:mergeinfo + /trunk:4770 /trunk/nhibernate:4768 Property changes on: branches/2.1.x/nhibernate/src/NHibernate ___________________________________________________________________ Added: svn:mergeinfo + /trunk/nhibernate/src:4770 Property changes on: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Customer.cs ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/src/NHibernate.Test/NHSpecificTest/NH1850/Customer.cs:4770 Property changes on: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Fixture.cs ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/src/NHibernate.Test/NHSpecificTest/NH1850/Fixture.cs:4770 Property changes on: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1850/Mappings.hbm.xml ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/src/NHibernate.Test/NHSpecificTest/NH1850/Mappings.hbm.xml:4770 Property changes on: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1927 ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/src/NHibernate.Test/NHSpecificTest/NH1927:4770 Property changes on: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1928 ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/src/NHibernate.Test/NHSpecificTest/NH1928:4770 Property changes on: branches/2.1.x/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests:4770 Property changes on: branches/2.1.x/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaExportTests/WithColumnTag.hbm.xml ___________________________________________________________________ Deleted: svn:mergeinfo - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |