Changeset 852 for trunk/sources/HeuristicLab.sln

Timestamp:

11/28/08 21:51:20 (15 years ago)

Author:

swagner

Message:

Integrated ConfigMerger into build process (#403).
Refactored pre- and post-build scripts (#403).

File:

• trunk/sources/HeuristicLab.sln (modified) (4 diffs)

trunk/sources/HeuristicLab.sln

@@ -4 +4 @@
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{96396439-A764-4022-A8D2-BE021449B8D1}"
   ProjectSection(SolutionItems) = preProject
+    ConfigMerger.exe = ConfigMerger.exe
     ..\documentation\License\gpl-3.0.txt = ..\documentation\License\gpl-3.0.txt
     PreBuildEvent.cmd = PreBuildEvent.cmd
@@ -585 +586 @@
     {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Any CPU.Build.0 = Release|Any CPU
     {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.ActiveCfg = Release|Any CPU
-<<<<<<< .mine
     {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -592 +592 @@
     {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|Any CPU.Build.0 = Release|Any CPU
     {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}.Release|x86.ActiveCfg = Release|Any CPU
-=======
     {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -599 +598 @@
     {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Release|Any CPU.Build.0 = Release|Any CPU
     {42A1D075-6C12-4DD9-B0C2-C6F5210A8119}.Release|x86.ActiveCfg = Release|Any CPU
->>>>>>> .r781
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution