Context Navigation

HeuristicLab.CodeEditor

Timestamp:

09/14/12 18:58:15 (12 years ago)

Author:

gkronber

Message:

#1847 merged r8205:8635 from trunk into branch

Location:

branches/GP-MoveOperators

Files:

Property svn:ignore

old	new
21	21	protoc.exe
22	22	_ReSharper.HeuristicLab 3.3 Tests
	23	Google.ProtocolBuffers-2.4.1.473.dll

Property svn:mergeinfo changed

/branches/Algorithms.GradientDescent (added)	merged: 5516,5518,5520
/branches/ScatterSearch (trunk integration) (added)	merged: 7787,7789,7793,7806,7815,7821-7822,7954,8086,8171,8299,8303-8307,8319-8320,8322,8327-8328,8331-8332
/trunk/sources	merged: 8208-8212,8220-8226,8231,8233,8238,8240-8241,8245-8246,8252-8256,8280,8282-8283,8288-8289,8295-8296,8298,8309-8311,8317,8323-8325,8333-8335,8338-8346,8348,8351,8353,8355,8357-8358,8361,8363-8364,8366-8368,8371-8372,8375,8380-8381,8386,8396-8399,8401,8403-8405,8413,8416-8419,8421,8433,8435,8439,8448,8452-8453,8455,8463-8465,8467,8469,8471,8473-8476,8478,8482,8484-8485,8489,8491,8493-8495,8497,8523,8528,8530-8531,8533,8536,8542-8543,8547-8554,8559-8568,8571,8573,8575,8577-8578,8580-8584,8587-8588,8592-8602,8604-8621,8623-8625,8628,8630,8632-8635

-                      r7021
+                      r8660
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
   <PropertyGroup>
     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
 …
 call PreBuildEvent.cmd
 </PreBuildEvent>
+<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+export ProjectDir=$(ProjectDir)
+export SolutionDir=$(SolutionDir)
+$SolutionDir/PreBuildEvent.sh
+</PreBuildEvent>
   </PropertyGroup>
 </Project>

r7259	r8660
27	27
28	28	namespace HeuristicLab.CodeEditor {
29		[Plugin("HeuristicLab.CodeEditor", "3.3.6.$WCREV$")]
	29	[Plugin("HeuristicLab.CodeEditor", "3.3.7.$WCREV$")]
30	30	[PluginFile("HeuristicLab.CodeEditor-3.3.dll", PluginFileType.Assembly)]
31	31	[PluginDependency("HeuristicLab.Common.Resources", "3.3")]

r7259	r8660
51	51	//
52	52	[assembly: AssemblyVersion("3.3.0.0")]
53		[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
	53	[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]

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