Merge branch 'master' into rename-to-electron

This commit is contained in:
Cheng Zhao 2015-04-12 21:49:08 +08:00
commit 43fe82e1e5
46 changed files with 1033 additions and 1364 deletions

View file

@ -49,10 +49,10 @@ python script\build.py
You can also only build the Debug target:
```powershell
python script\build.py -c Debug
python script\build.py -c D
```
After building is done, you can find `atom.exe` under `out\Debug`.
After building is done, you can find `atom.exe` under `out\D`.
## 64bit support