Merge branch 'incoming' of github.com:kripken/emscripten into incoming1.8.8

conflicts: tests/test_core.py tools/shared.py

1 files changed, 9 insertions, 9 deletions

diff --git a/system/lib/libcxxabi/src/cxa_exception.hpp b/system/lib/libcxxabi/src/cxa_exception.hpp
index 66f05c45..22c4da38 100644
--- a/system/lib/libcxxabi/src/cxa_exception.hpp
+++ b/system/lib/libcxxabi/src/cxa_exception.hpp
@@ -41,19 +41,19 @@ static const uint64_t get_vendor_and_language =     0xFFFFFFFFFFFFFF00; // mask
         std::unexpected_handler unexpectedHandler;
         std::terminate_handler  terminateHandler;
         
-         __cxa_exception *nextException;
+        __cxa_exception *nextException;
         
-         int handlerCount;
+        int handlerCount;
     
 #ifdef __ARM_EABI_UNWINDER__
-         __cxa_exception* nextPropagatingException;
-         int propagationCount;
+        __cxa_exception* nextPropagatingException;
+        int propagationCount;
 #else
-         int handlerSwitchValue;
-         const unsigned char *actionRecord;
-         const unsigned char *languageSpecificData;
-         void *catchTemp;
-         void *adjustedPtr;
+        int handlerSwitchValue;
+        const unsigned char *actionRecord;
+        const unsigned char *languageSpecificData;
+        void *catchTemp;
+        void *adjustedPtr;
 #endif
 
 #if !__LP64__