Cheng Zhao
|
a4715f936b
|
Merge branch 'master' into chrome31
Conflicts:
common/atom_version.h
|
2013-12-17 12:58:25 +08:00 |
|
Cheng Zhao
|
4e4e316005
|
Include Environment declarations in node_common.h.
|
2013-12-16 14:46:05 +08:00 |
|
Cheng Zhao
|
886ebdb002
|
Use node's Environment feature to add "require" in renderer.
|
2013-12-15 14:20:28 +08:00 |
|
Cheng Zhao
|
61c63a6af9
|
Fix crashes about persistent v8 functions.
|
2013-12-12 00:10:09 +08:00 |
|
Cheng Zhao
|
409a431892
|
Huge commit to use new V8 and Content APIs.
Still got a lots of linking errors!
|
2013-12-11 15:48:19 +08:00 |
|