Ignore:
Timestamp:
Aug 2, 2011 1:00:21 PM (8 years ago)
Author:
tkr
Message:

Merging r1775 from stable/1.14

Location:
trunk/Clp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp

  • trunk/Clp/MSVisualStudio/v10/Clp.sln

    r1704 r1776  
    88EndProject
    99Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clp", "clp\clp.vcxproj", "{0E9135A7-CB30-48D9-A83D-0F49EC3B601B}"
     10        ProjectSection(ProjectDependencies) = postProject
     11                {C4867F15-438D-4FF8-8388-62FBAAA9786C} = {C4867F15-438D-4FF8-8388-62FBAAA9786C}
     12                {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994} = {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}
     13        EndProjectSection
    1014EndProject
    1115Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libClp", "libClp\libClp.vcxproj", "{4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}"
     
    3034        GlobalSection(ProjectConfigurationPlatforms) = postSolution
    3135                {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Debug|Win32.ActiveCfg = Debug|Win32
    32                 {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Debug|x64.ActiveCfg = Debug|Win32
     36                {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Debug|Win32.Build.0 = Debug|Win32
     37                {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Debug|x64.ActiveCfg = Debug|x64
     38                {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Debug|x64.Build.0 = Debug|x64
    3339                {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Release|Win32.ActiveCfg = Release|Win32
    34                 {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Release|x64.ActiveCfg = Release|Win32
     40                {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Release|Win32.Build.0 = Release|Win32
     41                {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Release|x64.ActiveCfg = Release|x64
     42                {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Release|x64.Build.0 = Release|x64
    3543                {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Debug|Win32.ActiveCfg = Debug|Win32
    36                 {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Debug|x64.ActiveCfg = Debug|Win32
     44                {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Debug|Win32.Build.0 = Debug|Win32
     45                {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Debug|x64.ActiveCfg = Debug|x64
     46                {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Debug|x64.Build.0 = Debug|x64
    3747                {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Release|Win32.ActiveCfg = Release|Win32
    38                 {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Release|x64.ActiveCfg = Release|Win32
     48                {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Release|Win32.Build.0 = Release|Win32
     49                {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Release|x64.ActiveCfg = Release|x64
     50                {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Release|x64.Build.0 = Release|x64
    3951                {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Debug|Win32.ActiveCfg = Debug|Win32
    40                 {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Debug|x64.ActiveCfg = Debug|Win32
     52                {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Debug|Win32.Build.0 = Debug|Win32
     53                {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Debug|x64.ActiveCfg = Debug|x64
     54                {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Debug|x64.Build.0 = Debug|x64
    4155                {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Release|Win32.ActiveCfg = Release|Win32
    42                 {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Release|x64.ActiveCfg = Release|Win32
     56                {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Release|Win32.Build.0 = Release|Win32
     57                {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Release|x64.ActiveCfg = Release|x64
     58                {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Release|x64.Build.0 = Release|x64
    4359                {0E9135A7-CB30-48D9-A83D-0F49EC3B601B}.Debug|Win32.ActiveCfg = Debug|Win32
    4460                {0E9135A7-CB30-48D9-A83D-0F49EC3B601B}.Debug|Win32.Build.0 = Debug|Win32
Note: See TracChangeset for help on using the changeset viewer.