Merge branch 'memoryInitializer_cdn' of https://github.com/amandle/emscripten into incoming

Conflicts:
	AUTHORS

AUTHORS

@@ -159,4 +159,5 @@ a license to everyone to use it as detailed in LICENSE.)
 * Gauthier Billot <gogoprog@gmail.com>
 * Árpád Goretity <h2co3@h2co3.org>
 * Nicholas Wilson <nicholas@nicholaswilson.me.uk>
+* Aaron Mandle <aaronmandle@gmail.com>
 

src/postamble.js

@@ -2,7 +2,9 @@
 // === Auto-generated postamble setup entry stuff ===
 
 if (memoryInitializer) {
-  if (Module['memoryInitializerPrefixURL']) {
+  if (typeof Module['locateFile'] === 'function') {
+    memoryInitializer = Module['locateFile'](memoryInitializer);
+  } else if (Module['memoryInitializerPrefixURL']) {
     memoryInitializer = Module['memoryInitializerPrefixURL'] + memoryInitializer;
   }
   if (ENVIRONMENT_IS_NODE || ENVIRONMENT_IS_SHELL) {

tools/file_packager.py

@@ -488,8 +488,12 @@ if has_preloaded:
     }
     var PACKAGE_NAME = '%s';
     var REMOTE_PACKAGE_BASE = '%s';
-    var REMOTE_PACKAGE_NAME = typeof Module['locateFilePackage'] === 'function' ?
-                              Module['locateFilePackage'](REMOTE_PACKAGE_BASE) :
+    if (typeof Module['locateFilePackage'] === 'function' && !Module['locateFile']) {
+      Module['locateFile'] = Module['locateFilePackage'];
+      Module.printErr('warning: you defined Module.locateFilePackage, that has been renamed to Module.locateFile (using your locateFilePackage for now)');
+    }
+    var REMOTE_PACKAGE_NAME = typeof Module['locateFile'] === 'function' ?
+                              Module['locateFile'](REMOTE_PACKAGE_BASE) :
                               ((Module['filePackagePrefixURL'] || '') + REMOTE_PACKAGE_BASE);
     var REMOTE_PACKAGE_SIZE = %d;
     var PACKAGE_UUID = '%s';