BackPup/node
1
0 Fork 0
mirror of https://github.com/nodejs/node.git synced 2026-11-09 15:11:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/v0.10' into v0.12

Browse Source 
Conflicts:
	test/simple/test-child-process-spawn-typeerror.js
This commit is contained in:
Julien Gilli committed 2015-01-14 15:38:15 -08:00
2 parents fbfe562d71 0c50195071
commit 307daedd2c
2 files changed
-57
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

doc/sh.css
-24
View File
@@ -1,24 +0,0 @@
.sh_sourceCode {
font-weight: normal;
font-style: normal;
}
.sh_sourceCode .sh_symbol,
.sh_sourceCode .sh_cbracket {
color: #333;
}
.sh_sourceCode .sh_keyword {
color: #c96;
}
.sh_sourceCode .sh_string,
.sh_sourceCode .sh_regexp,
.sh_sourceCode .sh_number,
.sh_sourceCode .sh_specialchar {
color: #690;
}
.sh_sourceCode .sh_comment {
color: #666;
}
doc/sh_vim-dark.css
-33
View File
@@ -1,33 +0,0 @@
.sh_sourceCode {
font-weight: normal;
font-style: normal;
}
.sh_sourceCode .sh_symbol ,
.sh_sourceCode .sh_cbracket {
color: #fff;
}
.sh_sourceCode .sh_keyword {
font-style: italic;
}
.sh_sourceCode .sh_string,
.sh_sourceCode .sh_regexp,
.sh_sourceCode .sh_number,
.sh_sourceCode .sh_specialchar {
color: #a0c874;
}
.sh_sourceCode .sh_comment {
color: #777;
}
.alt .sh_sourceCode .sh_keyword {
font-style: normal;
color: #996633;
}
.alt .sh_sourceCode .sh_symbol , .alt .sh_sourceCode .sh_cbracket {
color: #46483e;
}