Context Navigation

← Previous Change
Next Change →

Changeset 7215 for branches/HeuristicLab.Hive.Azure/HeuristicLab.CodeEditor

Timestamp:

12/20/11 13:54:57 (13 years ago)

Author:

spimming

Message:

merged changes from trunk into branch

' removed pre-build event for multiple app.configs

Location:

branches/HeuristicLab.Hive.Azure

Files:

: 2 edited

. (modified) (2 props)
HeuristicLab.CodeEditor/3.3/HeuristicLab.CodeEditor-3.3.csproj (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/HeuristicLab.Hive.Azure

Property svn:ignore

-                      old
+                      new
 *.suo
 *.vsp
+Doxygen
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
 HeuristicLab.resharper.user
 ProtoGen.exe
 …
 bin
 protoc.exe
-HeuristicLab.ExtLibs.6.0.ReSharper.user
-Doxygen

Property svn:mergeinfo changed

/branches/Benchmarking/sources (added)	merged: 6920,6931-6932,6934,6948,6987,7000,7002,7004
/trunk/sources (added)	merged: 6993-6995,6997-6999,7001,7006-7015,7017-7018,7020-7024,7027-7030,7032-7034,7037-7043,7045-7071,7073-7074,7076-7079,7082,7084,7087,7091-7093,7097,7103-7104,7107-7108,7111-7113,7115,7122-7126,7130-7136,7139-7140,7142-7144,7146-7148,7150,7152,7155-7158,7161-7162,7164-7172,7177-7180,7182,7185,7187,7189-7192

branches/HeuristicLab.Hive.Azure/HeuristicLab.CodeEditor/3.3/HeuristicLab.CodeEditor-3.3.csproj

-                      r6866
+                      r7215
     <Reference Include="ICSharpCode.NRefactory, Version=3.1.1.5327, Culture=neutral, PublicKeyToken=efe927acf176eea2, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\HeuristicLab.ExtLibs\HeuristicLab.SharpDevelop\3.1.1.5327\ICSharpCode.NRefactory.dll</HintPath>
+      <HintPath>..\..\bin\ICSharpCode.NRefactory.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="ICSharpCode.SharpDevelop.Dom, Version=3.1.1.5327, Culture=neutral, PublicKeyToken=f829da5c02be14ee, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\HeuristicLab.ExtLibs\HeuristicLab.SharpDevelop\3.1.1.5327\ICSharpCode.SharpDevelop.Dom.dll</HintPath>
+      <HintPath>..\..\bin\ICSharpCode.SharpDevelop.Dom.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="ICSharpCode.TextEditor, Version=3.1.1.5327, Culture=neutral, PublicKeyToken=4d61825e8dd49f1a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\HeuristicLab.ExtLibs\HeuristicLab.SharpDevelop\3.1.1.5327\ICSharpCode.TextEditor.dll</HintPath>
+      <HintPath>..\..\bin\ICSharpCode.TextEditor.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Mono.Cecil, Version=0.6.9.1, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\HeuristicLab.ExtLibs\HeuristicLab.SharpDevelop\3.1.1.5327\Mono.Cecil.dll</HintPath>
+      <HintPath>..\..\bin\Mono.Cecil.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats:

Update cookies preferences