projects / platform / upstream / nodejs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f649626) | patch
src: fix up after botched merge conflict
authorBen Noordhuis <info@bnoordhuis.nl>
Thu, 3 Oct 2013 17:27:51 +0000 (19:27 +0200)
committerBen Noordhuis <info@bnoordhuis.nl>
Thu, 3 Oct 2013 17:28:01 +0000 (19:28 +0200)
commit58729f1bcdcd7b8ac751d10c78a1f7ab867afb74
treee81adaef46ecf25d02d123cd074b343d89c03457tree | snapshot
parentf649626c6faef9d74c1e77608f952b06f4c5205bcommit | diff
src: fix up after botched merge conflict

Mea culpa, I didn't properly resolve a merge conflict in the last two
commits.  The resulting segmentation fault only happened on Linux and
only sometimes.

Fixes #6306.
src/node.cc diff | blob | history
Domain: Web Framework / Common;