Mercurial > altnet-hispano

changeset 69:8becac0977d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ajustando el merge
author nelopauselli
date Thu, 19 May 2011 01:32:29 -0300
parents 99a7df8e35bd
children c7264bfc4b71
files Agendas/trunk/src/Agendas.Factories/Agendas.Factories.csproj Agendas/trunk/src/Agendas.Tests/Agendas.Tests.csproj Agendas/trunk/src/Agendas.sln
diffstat 3 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/Agendas/trunk/src/Agendas.Factories/Agendas.Factories.csproj	Thu May 19 01:29:52 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Factories/Agendas.Factories.csproj	Thu May 19 01:32:29 2011 -0300
@@ -45,6 +45,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AgendaFactory.cs" />
+    <Compile Include="AttributeFactory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
--- a/Agendas/trunk/src/Agendas.Tests/Agendas.Tests.csproj	Thu May 19 01:29:52 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Tests/Agendas.Tests.csproj	Thu May 19 01:32:29 2011 -0300
@@ -90,6 +90,10 @@
       <Project>{45804F1F-EB72-4F82-A227-088CAD9B785D}</Project>
       <Name>Agendas.Google</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Agendas.NHibernate\Agendas.NHibernate.csproj">
+      <Project>{9519A43A-9D5E-4BFD-9F88-AFFC53C9973A}</Project>
+      <Name>Agendas.NHibernate</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Agendas.Repositories.Memory\Agendas.Repositories.Memory.csproj">
       <Project>{28C5EBFB-EE69-4765-A880-D4DE0BC89F48}</Project>
       <Name>Agendas.Repositories.Memory</Name>
--- a/Agendas/trunk/src/Agendas.sln	Thu May 19 01:29:52 2011 -0300
+++ b/Agendas/trunk/src/Agendas.sln	Thu May 19 01:32:29 2011 -0300
@@ -23,8 +23,11 @@
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Agendas.Repositories.NHibernate", "Agendas.Repositories.NHibernate\Agendas.Repositories.NHibernate.csproj", "{0973DF44-3B90-4D2A-B579-C64C93B6C853}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Agendas.Blog", "Agendas.Blog\Agendas.Blog.csproj", "{DDD605FF-EF42-428A-AEB6-F3496A46A82B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Agendas.NHibernate", "Agendas.NHibernate\Agendas.NHibernate.csproj", "{9519A43A-9D5E-4BFD-9F88-AFFC53C9973A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,6 +70,10 @@
 		{DDD605FF-EF42-428A-AEB6-F3496A46A82B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DDD605FF-EF42-428A-AEB6-F3496A46A82B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DDD605FF-EF42-428A-AEB6-F3496A46A82B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9519A43A-9D5E-4BFD-9F88-AFFC53C9973A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9519A43A-9D5E-4BFD-9F88-AFFC53C9973A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9519A43A-9D5E-4BFD-9F88-AFFC53C9973A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9519A43A-9D5E-4BFD-9F88-AFFC53C9973A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE