diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2011-12-06 23:50:54 +0400 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2011-12-06 23:50:54 +0400 |
| commit | 20035931433a87e53d3726ec86fd5eedfed2c3fb (patch) | |
| tree | f2807e08e75c64d447de06b7dd9f528895477e2c /tools | |
| parent | e609195202d79221edc037309c3ef459514e3ff4 (diff) | |
| parent | 580e67015c464e8d2746fed9d1f2dcd26138aaef (diff) | |
Merge remote branch 'origin/v0.6'
Conflicts:
deps/v8/src/debug.cc
deps/v8/src/version.cc
src/node_version.h
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/osx-pkg.pmdoc/index.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/osx-pkg.pmdoc/index.xml b/tools/osx-pkg.pmdoc/index.xml index d805747fcfd..4ba2725c19c 100644 --- a/tools/osx-pkg.pmdoc/index.xml +++ b/tools/osx-pkg.pmdoc/index.xml @@ -12,8 +12,8 @@ \ /usr/local/bin/node\ \ -NPM was installed at\ +npm was installed at\ \ /usr/local/bin/npm\ \ -Make sure that /usr/local/bin is in your $PATH.}]]></resource></locale></resources><flags/><item type="file">01local.xml</item><item type="file">02npm.xml</item><mod>properties.title</mod><mod>properties.userDomain</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc>
\ No newline at end of file +Make sure that /usr/local/bin is in your $PATH.}]]></resource></locale></resources><flags/><item type="file">01local.xml</item><item type="file">02npm.xml</item><mod>properties.title</mod><mod>properties.userDomain</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc> |