Merge pull request #1234 from stuartpb/patch-2

Explain .lock-wscript and move it
This commit is contained in:
Carl Suster 2014-10-20 12:41:16 +11:00
commit 0f33f34295

View File

@ -16,6 +16,9 @@ coverage
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt .grunt
# node-waf configuration
.lock-wscript
# Compiled binary addons (http://nodejs.org/api/addons.html) # Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release build/Release
@ -23,6 +26,3 @@ build/Release
# Commenting this out is preferred by some people, see # Commenting this out is preferred by some people, see
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git- # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git-
node_modules node_modules
# Users Environment Variables
.lock-wscript