Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2020-02-22 07:08:48 +08:00
commit 6e768bec61
3 changed files with 6 additions and 11 deletions

View file

@ -2,7 +2,7 @@ WIN32_MODULE_COMPANYNAME=Moonchild Productions
WIN32_MODULE_COPYRIGHT=©Pale Moon, Firefox and Mozilla Developers, available under the MPL 2.0.
WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
WIN32_MODULE_TRADEMARKS=The Pale Moon logo and project names are the property of Moonchild Productions.
WIN32_MODULE_TRADEMARKS=The Pale Moon logo and project names are trademarks of Moonchild Productions.
WIN32_MODULE_DESCRIPTION=Pale Moon web browser
WIN32_MODULE_PRODUCTNAME=Pale Moon
WIN32_MODULE_NAME=Pale Moon