Merge branch 'incoming' into f32

Conflicts:
	src/parseTools.js
	src/preamble.js

1 files changed, 0 insertions, 2 deletions

diff --git a/em++ b/em++
index 810b7aec..ba09e1a2 100755
--- a/em++
+++ b/em++
@@ -8,7 +8,5 @@ import os, subprocess, sys
 from tools import shared
 
 os.environ['EMMAKEN_CXX'] = '1'
-if not os.path.exists(shared.PYTHON):
-  print >> sys.stderr, 'warning: PYTHON does not seem to be defined properly in ~/.emscripten (%s)' % shared.PYTHON
 exit(subprocess.call([shared.PYTHON, shared.EMCC] + sys.argv[1:]))