Merge pull request #3282 from bureken/master

Replace Mac with OS X
This commit is contained in:
Cheng Zhao 2015-11-02 18:33:27 +08:00
commit c763cbe298
4 changed files with 4 additions and 4 deletions

View file

@ -20,7 +20,7 @@ unacceptable behavior to atom@github.com.
## Downloads ## Downloads
Prebuilt binaries and debug symbols of Electron for Linux, Windows and Mac can Prebuilt binaries and debug symbols of Electron for Linux, Windows and OS X can
be found on the [releases](https://github.com/atom/electron/releases) page. be found on the [releases](https://github.com/atom/electron/releases) page.
You can also use [`npm`](https://docs.npmjs.com/) to install prebuilt electron You can also use [`npm`](https://docs.npmjs.com/) to install prebuilt electron

View file

@ -31,7 +31,7 @@ app.on('window-all-closed', function() {
// Specify flash path. // Specify flash path.
// On Windows, it might be /path/to/pepflashplayer.dll // On Windows, it might be /path/to/pepflashplayer.dll
// On Mac, /path/to/PepperFlashPlayer.plugin // On OS X, /path/to/PepperFlashPlayer.plugin
// On Linux, /path/to/libpepflashplayer.so // On Linux, /path/to/libpepflashplayer.so
app.commandLine.appendSwitch('ppapi-flash-path', '/path/to/libpepflashplayer.so'); app.commandLine.appendSwitch('ppapi-flash-path', '/path/to/libpepflashplayer.so');

View file

@ -39,7 +39,7 @@ app.on('window-all-closed', function() {
// Epecifica o caminho do flash. // Epecifica o caminho do flash.
// No Windows, deve ser /path/to/pepflashplayer.dll // No Windows, deve ser /path/to/pepflashplayer.dll
// No Mac, /path/to/PepperFlashPlayer.plugin // No OS X, /path/to/PepperFlashPlayer.plugin
// No Linux, /path/to/libpepflashplayer.so // No Linux, /path/to/libpepflashplayer.so
app.commandLine.appendSwitch('ppapi-flash-path', '/path/to/libpepflashplayer.so'); app.commandLine.appendSwitch('ppapi-flash-path', '/path/to/libpepflashplayer.so');

View file

@ -38,7 +38,7 @@ app.on('window-all-closed', function() {
// Specify flash path. // Specify flash path.
// On Windows, it might be /path/to/pepflashplayer.dll // On Windows, it might be /path/to/pepflashplayer.dll
// On Mac, /path/to/PepperFlashPlayer.plugin // On OS X, /path/to/PepperFlashPlayer.plugin
// On Linux, /path/to/libpepflashplayer.so // On Linux, /path/to/libpepflashplayer.so
app.commandLine.appendSwitch('ppapi-flash-path', '/path/to/libpepflashplayer.so'); app.commandLine.appendSwitch('ppapi-flash-path', '/path/to/libpepflashplayer.so');