projects / platform / upstream / nodejs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bf85bc 7b7da2e)
Merge v1.8.1.
authorChris Dickinson <christopher.s.dickinson@gmail.com>
Tue, 21 Apr 2015 03:25:08 +0000 (20:25 -0700)
committerChris Dickinson <christopher.s.dickinson@gmail.com>
Tue, 21 Apr 2015 03:25:08 +0000 (20:25 -0700)
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>
1  2 
src/node_version.h patch | diff1 | diff2 | blob | history

diff --cc src/node_version.h
Simple merge
Domain: Web Framework / Common;