Mercurial > altnet-hispano
comparison Agendas/trunk/src/Agendas.sln @ 69:8becac0977d7
Ajustando el merge
author | nelopauselli |
---|---|
date | Thu, 19 May 2011 01:32:29 -0300 |
parents | 99a7df8e35bd |
children | 7e9ffde4022d |
comparison
equal
deleted
inserted
replaced
68:99a7df8e35bd | 69:8becac0977d7 |
---|---|
21 Diagramas\Dominio.dgml = Diagramas\Dominio.dgml | 21 Diagramas\Dominio.dgml = Diagramas\Dominio.dgml |
22 Features.txt = Features.txt | 22 Features.txt = Features.txt |
23 EndProjectSection | 23 EndProjectSection |
24 EndProject | 24 EndProject |
25 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Agendas.Repositories.NHibernate", "Agendas.Repositories.NHibernate\Agendas.Repositories.NHibernate.csproj", "{0973DF44-3B90-4D2A-B579-C64C93B6C853}" | 25 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Agendas.Repositories.NHibernate", "Agendas.Repositories.NHibernate\Agendas.Repositories.NHibernate.csproj", "{0973DF44-3B90-4D2A-B579-C64C93B6C853}" |
26 EndProject | |
26 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Agendas.Blog", "Agendas.Blog\Agendas.Blog.csproj", "{DDD605FF-EF42-428A-AEB6-F3496A46A82B}" | 27 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Agendas.Blog", "Agendas.Blog\Agendas.Blog.csproj", "{DDD605FF-EF42-428A-AEB6-F3496A46A82B}" |
28 EndProject | |
29 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Agendas.NHibernate", "Agendas.NHibernate\Agendas.NHibernate.csproj", "{9519A43A-9D5E-4BFD-9F88-AFFC53C9973A}" | |
27 EndProject | 30 EndProject |
28 Global | 31 Global |
29 GlobalSection(SolutionConfigurationPlatforms) = preSolution | 32 GlobalSection(SolutionConfigurationPlatforms) = preSolution |
30 Debug|Any CPU = Debug|Any CPU | 33 Debug|Any CPU = Debug|Any CPU |
31 Release|Any CPU = Release|Any CPU | 34 Release|Any CPU = Release|Any CPU |
65 {0973DF44-3B90-4D2A-B579-C64C93B6C853}.Release|Any CPU.Build.0 = Release|Any CPU | 68 {0973DF44-3B90-4D2A-B579-C64C93B6C853}.Release|Any CPU.Build.0 = Release|Any CPU |
66 {DDD605FF-EF42-428A-AEB6-F3496A46A82B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 69 {DDD605FF-EF42-428A-AEB6-F3496A46A82B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
67 {DDD605FF-EF42-428A-AEB6-F3496A46A82B}.Debug|Any CPU.Build.0 = Debug|Any CPU | 70 {DDD605FF-EF42-428A-AEB6-F3496A46A82B}.Debug|Any CPU.Build.0 = Debug|Any CPU |
68 {DDD605FF-EF42-428A-AEB6-F3496A46A82B}.Release|Any CPU.ActiveCfg = Release|Any CPU | 71 {DDD605FF-EF42-428A-AEB6-F3496A46A82B}.Release|Any CPU.ActiveCfg = Release|Any CPU |
69 {DDD605FF-EF42-428A-AEB6-F3496A46A82B}.Release|Any CPU.Build.0 = Release|Any CPU | 72 {DDD605FF-EF42-428A-AEB6-F3496A46A82B}.Release|Any CPU.Build.0 = Release|Any CPU |
73 {9519A43A-9D5E-4BFD-9F88-AFFC53C9973A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | |
74 {9519A43A-9D5E-4BFD-9F88-AFFC53C9973A}.Debug|Any CPU.Build.0 = Debug|Any CPU | |
75 {9519A43A-9D5E-4BFD-9F88-AFFC53C9973A}.Release|Any CPU.ActiveCfg = Release|Any CPU | |
76 {9519A43A-9D5E-4BFD-9F88-AFFC53C9973A}.Release|Any CPU.Build.0 = Release|Any CPU | |
70 EndGlobalSection | 77 EndGlobalSection |
71 GlobalSection(SolutionProperties) = preSolution | 78 GlobalSection(SolutionProperties) = preSolution |
72 HideSolutionNode = FALSE | 79 HideSolutionNode = FALSE |
73 EndGlobalSection | 80 EndGlobalSection |
74 EndGlobal | 81 EndGlobal |