Add Nick Bray to authors.
Merge branch 'link_exports' of github.com:ncbray/emscripten into incoming
fix AF_INET6 value in settings.js
Do not attempt browser image decoding if the browser does not have the window.URL or window.webkitURL objects. Fix the warning print to appear in that case on Opera/9.80 (Windows NT 6.1; WOW64) Presto/2.12.388 Version/12.16.
Basic touch event support in GLUT for mobile browsers.
If WebGL context creation fails, return 0 in glutCreateWindow and EGL_NO_CONTEXT in eglCreateContext to allow the user to detect whether WebGL support is enabled in the browser or not.
Merge pull request #1483 from juj/graceful_gl_fail

Graceful gl fail
support input and output vars in inline js
Merge pull request #1467 from abergmeier/extend_versions

Extend use of LLVM_ADD_VERSION and CLANG_ADD_VERSION
Merge pull request #1403 from imvu/scons-updates-pull-request

Bring SCons integration up to date with latest incoming and fix some SCons build reliability issues and races
Merge pull request #1473 from juj/wno-warn-absolute-paths

Wno warn absolute paths
disable test_fcvt in s_0_x
disable test_fcvt in s_0_x
Merge pull request #1484 from juj/browser_image_decoding_check

Fix --preload-file on image files on Opera.
Merge pull request #1470 from inolen/preload_path_fixes

file preload path fixes
generate static linking invokes in the prelude; fixes #1468
ignore llvm 3.3 attributes
ignore nocapture parameters
remove nocapture in aligned byval
make dce check flexible