Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Commit

Permalink
0.12.11
Browse files Browse the repository at this point in the history
See #6340
  • Loading branch information
bbondy committed Jan 16, 2017
1 parent 2b0c9df commit f6e44eb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
runtime = electron
target = 2.0.10
target = 2.0.11
target_arch = x64
brave_electron_version = 2.0.10
brave_electron_version = 2.0.11
disturl = http://brave-laptop-binaries.s3.amazonaws.com/atom-shell/dist
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- Linux sandbox added. ([#874](https://github.com/brave/browser-laptop/issues/874))
- Window renderer processes no longer include Node, content renderer never did in Brave. ([#6454](https://github.com/brave/browser-laptop/issues/6454))
- URL bar autocomplete no longer flashes when you enter text. ([#6644](https://github.com/brave/browser-laptop/issues/6644))
- Muon updated to 2.0.10.
- Muon updated to 2.0.11.
- Chromium updated to 54.0.2840.100.

## [0.12.15](https://github.com/brave/browser-laptop/releases/v0.12.15dev)
Expand Down
4 changes: 2 additions & 2 deletions tools/cibuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import sys
import os.path

BRAVE_ELECTRON = '2.0.10'
UPSTREAM_ELECTRON = '2.0.10'
BRAVE_ELECTRON = '2.0.11'
UPSTREAM_ELECTRON = '2.0.11'
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
TARGET_ARCH= os.environ['TARGET_ARCH'] if os.environ.has_key('TARGET_ARCH') else 'x64'
os.environ['npm_config_arch'] = TARGET_ARCH
Expand Down

0 comments on commit f6e44eb

Please sign in to comment.