mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-04 03:49:07 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix incorrect merge which had reverted some parts of the Microsoft.Launcher.rc file (#2728)

Browse Source 
* Had reverted the changes made in the Microsoft.Launcher.rc file by mistake while resolving merge conflicts

* reverted company name to how it was before
This commit is contained in:
Alekhya 2020-05-06 12:49:34 -07:00 committed by GitHub
parent d881fc2fe0
commit 63f1429a69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.rc
View File

@ -1,14 +1,15 @@
#include "resource.h"
#include "../../../common/version.h"
ഀ<EFBFBD>
匀吀刀䤀一䜀吀䄀䈀䰀䔀ഀ<EFBFBD>
䈀䔀䜀䤀一ഀ<EFBFBD>
IDS_LAUNCHER_NAME L"Launcher"
IDS_LAUNCHER_NAME L"Run"
    䤀䐀匀开䰀䄀唀一䌀䠀䔀刀开匀䔀吀吀䤀一䜀匀开䐀䔀匀䌀 䰀∀吀栀椀猀 昀攀愀琀甀爀攀 爀攀焀甀椀爀攀猀 圀椀渀搀漀眀猀 ㄀　Ⰰ 䴀愀礀 ㈀　㄀㤀 唀瀀搀愀琀攀∀ഀ<EFBFBD>
䔀一䐀ഀ<EFBFBD>
ഀ<EFBFBD>
㄀ 嘀䔀刀匀䤀伀一䤀一䘀伀ഀ<EFBFBD>
FILEVERSION 0,1,0,0
PRODUCTVERSION 0,1,0,0
FILEVERSION FILE_VERSION
PRODUCTVERSION PRODUCT_VERSION
 䘀䤀䰀䔀䘀䰀䄀䜀匀䴀䄀匀䬀 　砀㌀昀䰀ഀ<EFBFBD>
⌀椀昀搀攀昀 开䐀䔀䈀唀䜀ഀ<EFBFBD>
 䘀䤀䰀䔀䘀䰀䄀䜀匀 　砀㄀䰀ഀ<EFBFBD>
@ -23,14 +24,14 @@
    䈀䔀䜀䤀一ഀ<EFBFBD>
        䈀䰀伀䌀䬀 ∀　㐀　㤀　㐀戀　∀ഀ<EFBFBD>
        䈀䔀䜀䤀一ഀ<EFBFBD>
VALUE "CompanyName", "Company Name"
VALUE "FileDescription", "Wox.Launcher Module"
VALUE "FileVersion", "0.1.0.0"
VALUE "InternalName", "Wox.Launcher"
VALUE "LegalCopyright", "Copyright (C) 2019 Company Name"
VALUE "OriginalFilename", "Wox.Launcher.dll"
VALUE "ProductName", "Wox.Launcher"
VALUE "ProductVersion", "0.1.0.0"
VALUE "CompanyName", COMPANY_NAME
VALUE "FileDescription", "Microsoft.Launcher Module"
VALUE "FileVersion", FILE_VERSION_STRING
VALUE "InternalName", "Microsoft.Launcher"
VALUE "LegalCopyright", COPYRIGHT_NOTE
VALUE "OriginalFilename", "Microsoft.Launcher.dll"
VALUE "ProductName", "Microsoft.Launcher"
VALUE "ProductVersion", PRODUCT_VERSION_STRING
        䔀一䐀ഀ<EFBFBD>
    䔀一䐀ഀ<EFBFBD>
    䈀䰀伀䌀䬀 ∀嘀愀爀䘀椀氀攀䤀渀昀漀∀ഀ<EFBFBD>