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

Merge branch 'dev-next' into dev-syntax-code

Browse source
This commit is contained in:
Ima Mechanique 2012-11-26 20:04:50 +00:00
commit 5d30a4f09c
7 changed files with 26 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
trunk/LSLEditor.RES
View file

Binary file not shown.

4
trunk/Properties/AssemblyInfo.cs
View file

@ -70,7 +70,7 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.47.1.0")]
[assembly: AssemblyVersion("2.47.1.7")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
@ -100,4 +100,4 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDelaySign(false)]
//[assembly: AssemblyKeyName("")]
[assembly: ComVisibleAttribute(false)]
[assembly: AssemblyFileVersionAttribute("2.47.1.5")]
[assembly: AssemblyFileVersionAttribute("2.47.1.7")]

2
trunk/Properties/Resources.Designer.cs generated
View file

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.261
// Runtime Version:4.0.30319.296
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.

2
trunk/Properties/Resources.resx
View file

@ -117,7 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="COPY" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\icons\copy.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

44
trunk/Resource/About.htm
View file

@ -10,30 +10,28 @@
<br />
<marquee direction="up" SCROLLAMOUNT="2" height="120">
<ul>
<li>Vlad Bjornson</li>
<li>Mazok Nishi</li>
<li>Sonja Manatiso</li>
<li>Hippi Hammerer</li>
<li>Vlad Bjornson</li>
<li>Mazok Nishi</li>
<li>Sonja Manatiso</li>
<li>Hippi Hammerer</li>
<li>Baron Hauptmann</li>
<li>Arfim Balut</li>
<li>Thelma Huet</li>
<li>Baron Hauptmann</li>
<li>Arfim Balut</li>
<li>Thelma Huet</li>
<li>Rand Charleville</li>
<li>MeAm Okelly</li>
<li>krishna Kanik</li>
<li>Smoere Broek</li>
<li>Rand Charleville</li>
<li>MeAm Okelly</li>
<li>krishna Kanik</li>
<li>Smoere Broek</li>
<li>Frederick Zanzibar</li>
<li>Andon Beattie</li>
<li>Rejha Vuckovic</li>
<li>Alidar Moxie</li>
<li>Al Supercharge</li>
<li>Frederick Zanzibar</li>
<li>Andon Beattie</li>
<li>Rejha Vuckovic</li>
<li>Alidar Moxie</li>
<li>Al Supercharge</li>
<li>Krissmas Merryman</li>
<li>Jolan Fonda</li>
<li>Hippi Hammerer</li>
<li>Sonja Manatiso</li>
<li>Chase Marellan</li>
<li>Dui Zhang</li>
@ -76,7 +74,7 @@
<li>Dana Mureaux</li>
<li>Dig Somme</li>
<li>ichiro Kiama</li>
<li>Ichiro Kiama</li>
<li>Theo Outlander</li>
<li>Saul Kish</li>
@ -92,30 +90,23 @@
<li>Wolt Amat</li>
<li>Matthew White</li>
<li>Ruth Chabay</li>
<li>Ricky Lucero</li>
<li>Nico van Klaveren</li>
<li>SummerDale Beckstrand</li>
<li>Wen Grian</li>
<li>SK Decosta</li>
<li>Agathos Frascati</li>
<li>Rhianne Darkstone</li>
<li>Wolt Amat</li>
<li>Tarquin Janus</li>
<li>Costas Menico</li>
<li>Piet Garfield</li>
<li>Stephane Zugzwang</li>
<li>WaMark Basevi</li>
<li>Agathos Frascati</li>
<li>Al Supercharge</li>
<li>Pencilsky Germi</li>
<li>Kii Lilliehook</li>
<li>Metal Gynoid</li>
<li>Indigo Mertel</li>
<li>Tee Tulip</li>
<li>Frans Carbaat</li>
<li>Orcian Longstaff</li>
@ -156,7 +147,6 @@
<li>Ralph Brown</li>
<li>Igorbar Barbosa</li>
<li>Ichiro Kiama</li>
<li>Fletcher Rock</li>
<li>Zoe Gauvreau</li>

4
trunk/Resource/ReleaseNotes.htm
View file

@ -8,7 +8,7 @@
<body style="background-color: white; font-family: Verdana, sans-serif;font-size: 13px;line-height: 1.3">
<div>
<div>
<h3><span class="date">2012-11-00</span> - Release 2.47.1</h3>
<h3><span class="date">2012-11-26</span> - Release 2.47.1</h3>
<div>
* Funtions Added:
<ul>
@ -66,7 +66,7 @@
<div>
* Fixed:
<ul>
<li>LSLEditor.exe now shows its version number, etc when using Windows Explorer&apos;s Properties => Details.</li>
<li>Removed several duplicate names from the Help => About dialogue.</li>
</ul>
</div>
</div>

6
trunk/lsleditor.csproj
View file

@ -7,7 +7,8 @@
<ProjectGuid>{59468D25-6E68-4113-B740-C6EF4695045B}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon>App.ico</ApplicationIcon>
<ApplicationIcon>
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>LSLEditor</AssemblyName>
@ -26,8 +27,7 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<SignAssembly>true</SignAssembly>
<Win32Resource>
</Win32Resource>
<Win32Resource>E:\Dev\SL\C#\lsleditor\official\trunk\LSLEditor.RES</Win32Resource>
<OldToolsVersion>3.5</OldToolsVersion>
<IsWebBootstrapper>true</IsWebBootstrapper>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>