Context Navigation

← Previous Change
Next Change →

Changeset 9363 for branches/OaaS/HeuristicLab.Problems.VehicleRouting/3.3

Timestamp:

04/16/13 13:13:41 (12 years ago)

Author:

spimming

Message:

Merged revisions from trunk

Location:

Files:

: 5 edited

. (modified) (2 props)
HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
HeuristicLab.Problems.VehicleRouting/3.3/HeuristicLab.Problems.VehicleRouting-3.3.csproj (modified) (2 diffs)
HeuristicLab.Problems.VehicleRouting/3.3/Plugin.cs.frame (modified) (1 diff)
HeuristicLab.Problems.VehicleRouting/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/OaaS

Property svn:ignore

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

Property svn:mergeinfo changed

/branches/Algorithms.GradientDescent (added)	merged: 5516,5518,5520
/branches/RuntimeOptimizer (added)	merged: 8943,8955-8956,8961,8971,8975,8977,9040-9041,9078
/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
/branches/SlaveShutdown (added)	merged: 8944-8945,8949,8951,8953-8954
/branches/UnloadJobs (added)	merged: 9168-9170,9173-9174,9183-9184,9187-9188,9193,9201-9202
/trunk/sources (added)	merged: 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-8639,8641-8642,8645-8647,8649-8654,8656,8658-8659,8662,8664,8666-8668,8672,8677-8685,8688-8693,8698-8700,8702-8706,8708,8716-8721,8723-8724,8726-8736,8738,8740-8741,8745-8746,8748-8749,8756-8759,8763,8769,8771-8772,8774-8775,8778,8780-8781,8785-8786,8788,8790,8793-8794,8796,8798-8806,8816,8818-8819,8821-8823,8825,8827-8838,8840-8841,8844-8857,8859-8861,8868-8872,8874,8876-8878,8880-8889,8891,8893-8895,8899-8900,8902-8914,8917,8921-8934,8936,8938-8940,8942,8946-8948,8950,8952,8957,8960,8962-8970,8972-8974,8976,8978-8994,8999-9019,9021-9031,9033-9039,9043,9049,9052,9055-9057,9063,9068,9072,9075-9076,9079,9085-9086,9088,9091-9094,9096-9098,9101,9104,9106-9108,9111,9120,9123,9127-9128,9131,9133-9134,9144,9151-9153,9156,9159,9177-9181,9186,9190,9195,9203,9207-9209,9211,9216-9219,9221-9225,9229-9232,9235-9236,9251,9257-9259,9261,9265-9270,9272,9276-9277,9287-9289,9294-9295,9300-9301,9304,9312-9313,9315,9321-9323,9326-9327,9332,9339-9340,9343-9345,9347,9357-9360

branches/OaaS/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.VehicleRouting (added) merged: 8231,8246,8346,8455,8497,8600,8649,8651-8653,8720,8763,8894,8899,8905,8922,9010,9321

branches/OaaS/HeuristicLab.Problems.VehicleRouting/3.3/HeuristicLab.Problems.VehicleRouting-3.3.csproj

-                      r6866
+                      r9363
   -->
   <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>

branches/OaaS/HeuristicLab.Problems.VehicleRouting/3.3/Plugin.cs.frame

r7259	r9363
26	26	/// Plugin class for HeuristicLab.Problems.VehicleRouting plugin
27	27	/// </summary>
28		[Plugin("HeuristicLab.Problems.VehicleRouting", "3.3.6.$WCREV$")]
	28	[Plugin("HeuristicLab.Problems.VehicleRouting", "3.3.7.$WCREV$")]
29	29	[PluginFile("HeuristicLab.Problems.VehicleRouting-3.3.dll", PluginFileType.Assembly)]
30	30	[PluginDependency("HeuristicLab.Analysis", "3.3")]

branches/OaaS/HeuristicLab.Problems.VehicleRouting/3.3/Properties/AssemblyInfo.cs.frame

r7259	r9363
53	53	// by using the '*' as shown below:
54	54	[assembly: AssemblyVersion("3.3.0.0")]
55		[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
	55	[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]

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

Download in other formats:

Update cookies preferences