Merge branch 'master' into rename-to-electron
This commit is contained in:
commit
43fe82e1e5
46 changed files with 1033 additions and 1364 deletions
|
@ -6,8 +6,8 @@
|
|||
#define ATOM_VERSION_H
|
||||
|
||||
#define ATOM_MAJOR_VERSION 0
|
||||
#define ATOM_MINOR_VERSION 22
|
||||
#define ATOM_PATCH_VERSION 3
|
||||
#define ATOM_MINOR_VERSION 23
|
||||
#define ATOM_PATCH_VERSION 0
|
||||
|
||||
#define ATOM_VERSION_IS_RELEASE 1
|
||||
|
||||
|
|
|
@ -52,6 +52,14 @@ REFERENCE_MODULE(atom_renderer_ipc);
|
|||
REFERENCE_MODULE(atom_renderer_web_frame);
|
||||
#undef REFERENCE_MODULE
|
||||
|
||||
// The "v8::Function::kLineOffsetNotFound" is exported in node.dll, but the
|
||||
// linker can not find it, could be a bug of VS.
|
||||
#if defined(OS_WIN) && !defined(DEBUG)
|
||||
namespace v8 {
|
||||
const int Function::kLineOffsetNotFound = -1;
|
||||
}
|
||||
#endif
|
||||
|
||||
namespace atom {
|
||||
|
||||
namespace {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue