comparison Agendas/trunk/src/Agendas.sln @ 66:a61f3204c9f7

Merge
author jorge.rowies
date Tue, 17 May 2011 18:25:17 -0300
parents ebce59b45b50 963b71ea6028
children 99a7df8e35bd
comparison
equal deleted inserted replaced
65:ebce59b45b50 66:a61f3204c9f7
20 Diagramas\Componentes.dgml = Diagramas\Componentes.dgml 20 Diagramas\Componentes.dgml = Diagramas\Componentes.dgml
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.Blog", "Agendas.Blog\Agendas.Blog.csproj", "{DDD605FF-EF42-428A-AEB6-F3496A46A82B}" 26 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Agendas.Blog", "Agendas.Blog\Agendas.Blog.csproj", "{DDD605FF-EF42-428A-AEB6-F3496A46A82B}"
26 EndProject 27 EndProject
27 Global 28 Global
28 GlobalSection(SolutionConfigurationPlatforms) = preSolution 29 GlobalSection(SolutionConfigurationPlatforms) = preSolution
29 Debug|Any CPU = Debug|Any CPU 30 Debug|Any CPU = Debug|Any CPU
56 {319A8E3D-C61E-455F-A1BF-A6B1B1636BAB}.Release|Any CPU.Build.0 = Release|Any CPU 57 {319A8E3D-C61E-455F-A1BF-A6B1B1636BAB}.Release|Any CPU.Build.0 = Release|Any CPU
57 {306DDA8A-49A5-42E5-A639-A9D3D521865F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 58 {306DDA8A-49A5-42E5-A639-A9D3D521865F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58 {306DDA8A-49A5-42E5-A639-A9D3D521865F}.Debug|Any CPU.Build.0 = Debug|Any CPU 59 {306DDA8A-49A5-42E5-A639-A9D3D521865F}.Debug|Any CPU.Build.0 = Debug|Any CPU
59 {306DDA8A-49A5-42E5-A639-A9D3D521865F}.Release|Any CPU.ActiveCfg = Release|Any CPU 60 {306DDA8A-49A5-42E5-A639-A9D3D521865F}.Release|Any CPU.ActiveCfg = Release|Any CPU
60 {306DDA8A-49A5-42E5-A639-A9D3D521865F}.Release|Any CPU.Build.0 = Release|Any CPU 61 {306DDA8A-49A5-42E5-A639-A9D3D521865F}.Release|Any CPU.Build.0 = Release|Any CPU
62 {0973DF44-3B90-4D2A-B579-C64C93B6C853}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
63 {0973DF44-3B90-4D2A-B579-C64C93B6C853}.Debug|Any CPU.Build.0 = Debug|Any CPU
64 {0973DF44-3B90-4D2A-B579-C64C93B6C853}.Release|Any CPU.ActiveCfg = Release|Any CPU
65 {0973DF44-3B90-4D2A-B579-C64C93B6C853}.Release|Any CPU.Build.0 = Release|Any CPU
61 {DDD605FF-EF42-428A-AEB6-F3496A46A82B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 66 {DDD605FF-EF42-428A-AEB6-F3496A46A82B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62 {DDD605FF-EF42-428A-AEB6-F3496A46A82B}.Debug|Any CPU.Build.0 = Debug|Any CPU 67 {DDD605FF-EF42-428A-AEB6-F3496A46A82B}.Debug|Any CPU.Build.0 = Debug|Any CPU
63 {DDD605FF-EF42-428A-AEB6-F3496A46A82B}.Release|Any CPU.ActiveCfg = Release|Any CPU 68 {DDD605FF-EF42-428A-AEB6-F3496A46A82B}.Release|Any CPU.ActiveCfg = Release|Any CPU
64 {DDD605FF-EF42-428A-AEB6-F3496A46A82B}.Release|Any CPU.Build.0 = Release|Any CPU 69 {DDD605FF-EF42-428A-AEB6-F3496A46A82B}.Release|Any CPU.Build.0 = Release|Any CPU
65 EndGlobalSection 70 EndGlobalSection