Merge branch 'master' into dev

2016-06-06 21:30:23 +09:00
parent c49666648a c6d91e7ae4
commit 479b789629
16 changed files with 570 additions and 88 deletions
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -193,7 +193,7 @@ function makePackage(platform, arch, callback) {
    icon: 'resources/icon',
    "version-string": {
      CompanyName: packageJson.author.name,
-      LegalCopyright: 'Copyright (c) 2015 ' + packageJson.author.name,
+      LegalCopyright: 'Copyright (c) 2015 - 2016' + packageJson.author.name,
      FileDescription: packageJson.description,
      OriginalFilename: packageJson.productName + '.exe',
      ProductVersion: packageJson.version,