Skip to content

Commit

Permalink
Merge branch 'hotfix/v0.9.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
bux committed Jan 4, 2019
2 parents 2fb8764 + 051e42e commit 32c20af
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions tabler.Logic/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.9.0")]
[assembly: AssemblyFileVersion("0.9.0")]
[assembly: AssemblyVersion("0.9.1")]
[assembly: AssemblyFileVersion("0.9.1")]
1 change: 1 addition & 0 deletions tabler/Forms/FindForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
{
if (keyData == Keys.Escape)
{
_gridUi.FindFormOpen = false;
Close();
return true;
}
Expand Down
4 changes: 2 additions & 2 deletions tabler/Forms/FindForm.resx
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="cbSearchTerm.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
<value>1</value>
</data>
<data name="&gt;&gt;cbSearchTerm.Name" xml:space="preserve">
<value>cbSearchTerm</value>
Expand Down Expand Up @@ -175,7 +175,7 @@
<value>75, 23</value>
</data>
<data name="btnClose.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
<value>3</value>
</data>
<data name="btnClose.Text" xml:space="preserve">
<value>Close</value>
Expand Down
4 changes: 2 additions & 2 deletions tabler/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
// Minor Version
// Patch

[assembly: AssemblyVersion("0.9.0")]
[assembly: AssemblyFileVersion("0.9.0")]
[assembly: AssemblyVersion("0.9.1")]
[assembly: AssemblyFileVersion("0.9.1")]

0 comments on commit 32c20af

Please sign in to comment.