Compare commits

...

2 Commits

Author SHA1 Message Date
Electron Bot
0043acf70a Bump v3.1.0-beta.2 2018-12-03 18:35:22 -08:00
Roller Bot
e25f8c1a08 chore: bump libcc (3-1-x) (#15937)
* chore: bump libcc submodule to dfad80d80b265e508c4e583dda3f2860b20128b7

* chore: bump libcc in DEPS to dfad80d80b265e508c4e583dda3f2860b20128b7
2018-12-04 13:30:31 +11:00
7 changed files with 8 additions and 8 deletions

2
DEPS
View File

@@ -2,7 +2,7 @@ vars = {
'chromium_version':
'63.0.3239.150',
'libchromiumcontent_revision':
'99d8f691c3d64704304020f68d46113a1993e281',
'dfad80d80b265e508c4e583dda3f2860b20128b7',
'node_version':
'v9.7.0-33-g538a5023af',
'native_mate_revision':

View File

@@ -56,8 +56,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,1,0,1
PRODUCTVERSION 3,1,0,1
FILEVERSION 3,1,0,2
PRODUCTVERSION 3,1,0,2
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L

View File

@@ -8,7 +8,7 @@
#define ATOM_MAJOR_VERSION 3
#define ATOM_MINOR_VERSION 1
#define ATOM_PATCH_VERSION 0
#define ATOM_PRE_RELEASE_VERSION -beta.1
#define ATOM_PRE_RELEASE_VERSION -beta.2
#ifndef ATOM_STRINGIFY
#define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)

View File

@@ -4,7 +4,7 @@
'product_name%': 'Electron',
'company_name%': 'GitHub, Inc',
'company_abbr%': 'github',
'version%': '3.1.0-beta.1',
'version%': '3.1.0-beta.2',
'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
},
'includes': [

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "electron",
"version": "3.1.0",
"version": "3.1.0-beta.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@@ -1,6 +1,6 @@
{
"name": "electron",
"version": "3.1.0-beta.1",
"version": "3.1.0-beta.2",
"repository": "https://github.com/electron/electron",
"description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
"devDependencies": {