Changeset 1981


Ignore:
Timestamp:
Oct 15, 2010, 2:09:55 PM (11 years ago)
Author:
Christoph Hartmann
Message:

Conflict resolved

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypTool 2.0.sln

    r1941 r1981  
    11
    22Microsoft Visual Studio Solution File, Format Version 11.00
    3 # Visual Studio 2010
    43Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrypStartup", "CrypStartup\CrypStartup.csproj", "{347B5433-A40E-4ACC-AD6B-A245509AB42E}"
    54EndProject
     
    244243Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RPNExpression", "CrypPlugins\RPNExpression\RPNExpression.csproj", "{21CF7D7A-50AC-45CF-AA87-E7ADF4201B85}"
    245244EndProject
     245
    246246Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SZ42", "CrypPlugins\SZ42\SZ42.csproj", "{0B94492B-6B12-4233-940A-6AF6024BDA74}"
     247EndProject
     248Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlayfairAnalysis", "CrypPlugins\PlayfairAnalysis\PlayfairAnalysis.csproj", "{AA75627F-6087-4DEA-9AAB-F19A7835DD1C}"
     249EndProject
     250Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlayfairAnalysisStatistic", "CrypPlugins\PlayfairAnalysisStatistic\PlayfairAnalysisStatistic.csproj", "{4C135886-4BC1-4092-A65E-3BA920876559}"
    247251EndProject
    248252Global
Note: See TracChangeset for help on using the changeset viewer.