AriasCreations/LSLEditor
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev-v3' into dev-next

Browse source
This commit is contained in:
Ima Mechanique 2013-07-16 13:49:00 +01:00
commit 907d306c05
26 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

0
trunk/_ReSharper.lsleditor/BuildScriptCache/.crc → _ReSharper.lsleditor/BuildScriptCache/.crc
View file

0
trunk/_ReSharper.lsleditor/BuildScriptCache/.version → _ReSharper.lsleditor/BuildScriptCache/.version
View file

0
trunk/_ReSharper.lsleditor/BuildScriptCache/5/4680b305.dat → _ReSharper.lsleditor/BuildScriptCache/5/4680b305.dat
View file

0
trunk/_ReSharper.lsleditor/ModuleIds.xml → _ReSharper.lsleditor/ModuleIds.xml
View file

0
trunk/_ReSharper.lsleditor/NamedArguments/.crc → _ReSharper.lsleditor/NamedArguments/.crc
View file

0
trunk/_ReSharper.lsleditor/NamedArguments/.version → _ReSharper.lsleditor/NamedArguments/.version
View file

0
trunk/_ReSharper.lsleditor/NamedArguments/5/4680b305.dat → _ReSharper.lsleditor/NamedArguments/5/4680b305.dat
View file

0
trunk/_ReSharper.lsleditor/ProjectModel/ProjectModel.dat → _ReSharper.lsleditor/ProjectModel/ProjectModel.dat
View file

0
trunk/_ReSharper.lsleditor/Resources/.crc → _ReSharper.lsleditor/Resources/.crc
View file

0
trunk/_ReSharper.lsleditor/Resources/.version → _ReSharper.lsleditor/Resources/.version
View file

0
trunk/_ReSharper.lsleditor/Resources/5/626cc1d.dat → _ReSharper.lsleditor/Resources/5/626cc1d.dat
View file

0
trunk/_ReSharper.lsleditor/SymbolCache.bin → _ReSharper.lsleditor/SymbolCache.bin
View file

0
trunk/_ReSharper.lsleditor/TagPrefixes/.crc → _ReSharper.lsleditor/TagPrefixes/.crc
View file

0
trunk/_ReSharper.lsleditor/TagPrefixes/.version → _ReSharper.lsleditor/TagPrefixes/.version
View file

0
trunk/_ReSharper.lsleditor/TodoCache/.crc → _ReSharper.lsleditor/TodoCache/.crc
View file

0
trunk/_ReSharper.lsleditor/TodoCache/.version → _ReSharper.lsleditor/TodoCache/.version
View file

0
trunk/_ReSharper.lsleditor/TodoCache/3/79ddd176.dat → _ReSharper.lsleditor/TodoCache/3/79ddd176.dat
View file

0
trunk/_ReSharper.lsleditor/WebsiteFileReferences/.crc → _ReSharper.lsleditor/WebsiteFileReferences/.crc
View file

0
trunk/_ReSharper.lsleditor/WebsiteFileReferences/.version → _ReSharper.lsleditor/WebsiteFileReferences/.version
View file

0
trunk/_ReSharper.lsleditor/WordIndex/.crc → _ReSharper.lsleditor/WordIndex/.crc
View file

0
trunk/_ReSharper.lsleditor/WordIndex/.version → _ReSharper.lsleditor/WordIndex/.version
View file

0
trunk/_ReSharper.lsleditor/WordIndex/2/7003905d.dat → _ReSharper.lsleditor/WordIndex/2/7003905d.dat
View file

0
trunk/_ReSharper.lsleditor/WordIndex/5/4680b305.dat → _ReSharper.lsleditor/WordIndex/5/4680b305.dat
View file

0
trunk/_ReSharper.lsleditor/WordIndex/6/bf11a17.dat → _ReSharper.lsleditor/WordIndex/6/bf11a17.dat
View file

BIN
build/AssemblyRevisionIncrementer.exe Normal file
View file

Binary file not shown.

7
trunk/lsleditor.csproj
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup> <PropertyGroup>
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
@ -20,7 +20,7 @@
<DelaySign>false</DelaySign> <DelaySign>false</DelaySign>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<RootNamespace>LSLEditor</RootNamespace> <RootNamespace>LSLEditor</RootNamespace>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent> <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>LSLEditor.LSLEditorForm</StartupObject> <StartupObject>LSLEditor.LSLEditorForm</StartupObject>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
@ -873,7 +873,6 @@
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PreBuildEvent>"$(FrameworkSDKDir)Bin\rc.exe" /r "$(ProjectDir)$(TargetName).rc"</PreBuildEvent> <PreBuildEvent>"$(FrameworkSDKDir)Bin\rc.exe" /r "$(ProjectDir)$(TargetName).rc"</PreBuildEvent>
<PostBuildEvent> <PostBuildEvent>$(SolutionDir)\..\build\AssemblyRevisionIncrementer.exe /t="$(SolutionDir)\Properties\AssemblyInfo.cs"</PostBuildEvent>
</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
</Project> </Project>