Merge branch 'master' into 'release/0.1.2.016'

Master

See merge request SympatheticFire/linear-app-launcher!13
This commit is contained in:
Ray committed 2021-06-01 09:25:02 +00:00
commit 051f1701dc
44 files changed
+456 -255

No files matched your search

+2 -2
View File
@@ -63,9 +63,9 @@ namespace AppLauncher.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap app_icon_32 {
internal static System.Drawing.Bitmap app_icon {
get {
object obj = ResourceManager.GetObject("app_icon_32", resourceCulture);
object obj = ResourceManager.GetObject("app_icon", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
+2 -2
View File
@@ -118,8 +118,8 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="app_icon_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\app_icon_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="app_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\app_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="folder_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\folder_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>