Merge remote-tracking branch 'origin/v0.10'

Conflicts: src/unix/udp.c
alex · Nov 27, 2013 · 9342ef7 · 9342ef7
2 parents bf5038d + 7bb7371
commit 9342ef7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 *.l[oa]
 *.opensdf
 *.orig
+*.pyc
 *.sdf
 *.suo
 core

diff --git a/gyp_uv.py b/gyp_uv.py
@@ -75,7 +75,7 @@ def run_gyp(args):
   if sys.platform != 'win32':
     if '-f' not in args:
       args.extend('-f make'.split())
-    if 'ninja' not in args:
+    if 'eclipse' not in args and 'ninja' not in args:
       args.extend(['-Goutput_dir=' + output_dir])
       args.extend(['--generator-output', output_dir])
     (major, minor), is_clang = compiler_version()