Merge branch 'master' into new_vfs_library

Conflicts:
	src/gameinfoimpl.cpp
	src/installationmanager.cpp
	src/mainwindow.cpp
	src/organizercore.cpp
	src/organizercore.h
	src/organizerproxy.cpp
	src/organizerproxy.h
	src/savegamegamebryo.cpp
	src/savegamegamebyro.h
	src/selfupdater.h
	src/shared/fallout3info.cpp
	src/shared/fallout3info.h
	src/shared/falloutnvinfo.cpp
	src/shared/falloutnvinfo.h
	src/shared/gameinfo.cpp
	src/shared/gameinfo.h
	src/shared/oblivioninfo.cpp
	src/shared/oblivioninfo.h
	src/shared/skyriminfo.cpp
	src/shared/skyriminfo.h
	src/spawn.cpp
	src/transfersavesdialog.cpp

1 files changed, 3 insertions, 2 deletions

diff --git a/src/shared/stackdata.cpp b/src/shared/stackdata.cpp
index 6c5a0968..b336593a 100644
--- a/src/shared/stackdata.cpp
+++ b/src/shared/stackdata.cpp
@@ -24,7 +24,7 @@ static void initDbgIfNecess()
       firstCall = false;

     }

     if (!::SymInitialize(process, NULL, TRUE)) {

-      printf("failed to initialize symbols: %d", ::GetLastError());

+      printf("failed to initialize symbols: %lu", ::GetLastError());

     }

     initialized.insert(::GetCurrentProcessId());

   }

@@ -99,7 +99,8 @@ void StackData::initTrace() {
   CONTEXT context;

   std::memset(&context, 0, sizeof(CONTEXT));

   context.ContextFlags = CONTEXT_CONTROL;

-#if BOOST_ARCH_X86_64

+  //Why only for 64 bit?

+#if BOOST_ARCH_X86_64 || defined(__clang__)

   ::RtlCaptureContext(&context);

 #else

   __asm