diff options
| author | Chris Dickinson <christopher.s.dickinson@gmail.com> | 2015-04-20 20:25:08 -0700 |
|---|---|---|
| committer | Chris Dickinson <christopher.s.dickinson@gmail.com> | 2015-04-20 20:25:08 -0700 |
| commit | 59a5c98f2c987080634ed078c9868e23e8c55820 (patch) | |
| tree | 9135de0054cfc4caf12888a1d93fbb8476f565e7 /src/node_version.h | |
| parent | 6bf85bc81e7e61b4126c50d05555d5928343423b (diff) | |
| parent | 7b7da2edf79a95aa9ab2b7ff6dc74557d4cd0d64 (diff) | |
| download | android-node-v8-59a5c98f2c987080634ed078c9868e23e8c55820.tar.gz android-node-v8-59a5c98f2c987080634ed078c9868e23e8c55820.tar.bz2 android-node-v8-59a5c98f2c987080634ed078c9868e23e8c55820.zip | |
Merge v1.8.1.
This brings in the '%PYTHON%' revert, and restores
the correct NODE_MODULE_VERSION.
PR-URL: https://github.com/iojs/io.js/pull/1482
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'src/node_version.h')
| -rw-r--r-- | src/node_version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/node_version.h b/src/node_version.h index ee885bc947..d24973bde1 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -45,6 +45,6 @@ * an API is broken in the C++ side, including in v8 or * other dependencies. */ -#define NODE_MODULE_VERSION 44 /* io.js v1.1.0 */ +#define NODE_MODULE_VERSION 43 /* io.js v1.1.0 */ #endif /* SRC_NODE_VERSION_H_ */ |