clear merging conflict

StgSharp.Native/x64/Debug/dllmain.cod

@@ -14,109 +14,109 @@ __8C83BECC_concurrencysal@h DB 01H
 __608E3340_sal@h DB 01H
 __FB67E29A_vadefs@h DB 01H
 __1D1B619C_vcruntime@h DB 01H
-__735960E1_corecrt@h DB 01H
-__211DB995_corecrt_malloc@h DB 01H
-__7CD62D9E_malloc@h DB 01H
+__1B0272D9_corecrt@h DB 01H
+__45DED006_corecrt_malloc@h DB 01H
+__FA77ED4C_malloc@h DB 01H
 __9DCE0DC8_xmmintrin@h DB 01H
-__4C2AD0C7_winpackagefamily@h DB 01H
-__9DED9ED1_winapifamily@h DB 01H
-__12FEDF4E_sdkddkver@h DB 01H
+__0ED14FEE_winpackagefamily@h DB 01H
+__F92EF742_winapifamily@h DB 01H
+__22E515EB_sdkddkver@h DB 01H
 __9BAEE128_excpt@h DB 01H
 __B7B53233_stdarg@h DB 01H
-__6B04FCB3_specstrings_undef@h DB 01H
-__F4027AF7_specstrings_strict@h DB 01H
-__B90340D4_sdv_driverspecs@h DB 01H
-__BFFF5AD3_driverspecs@h DB 01H
-__32847078_specstrings@h DB 01H
-__108B2620_corecrt_wctype@h DB 01H
-__6CD6613D_ctype@h DB 01H
-__30902A1F_kernelspecs@h DB 01H
-__376FD5CA_basetsd@h DB 01H
-__13DE2371_errno@h DB 01H
+__29F49F40_specstrings_undef@h DB 01H
+__D0F42932_specstrings_strict@h DB 01H
+__F00405FD_sdv_driverspecs@h DB 01H
+__173E09CA_driverspecs@h DB 01H
+__9A452361_specstrings@h DB 01H
+__74484FB3_corecrt_wctype@h DB 01H
+__1EC467ED_ctype@h DB 01H
+__98517906_kernelspecs@h DB 01H
+__D3497022_basetsd@h DB 01H
+__61CC25A1_errno@h DB 01H
 __8C6AE390_vcruntime_string@h DB 01H
-__8ACB2152_corecrt_memcpy_s@h DB 01H
-__EA6C9D17_corecrt_memory@h DB 01H
-__0DF2AF52_corecrt_wstring@h DB 01H
-__6E889ECC_string@h DB 01H
-__9BEDF4DE_guiddef@h DB 01H
-__51BFD2FE_pshpack4@h DB 01H
-__31652CEA_poppack@h DB 01H
-__5532AE4C_pshpack2@h DB 01H
-__58A52B9A_pshpack8@h DB 01H
-__57741015_pshpack1@h DB 01H
-__CDE68C90_apiset@h DB 01H
-__0BF06E8D_ktmtypes@h DB 01H
-__40C200C0_winnt@h DB 01H
-__9336F789_minwindef@h DB 01H
-__55136115_windef@h DB 01H
-__32205BF0_apisetcconv@h DB 01H
-__B48FDEA0_minwinbase@h DB 01H
-__3551B028_apiquery2@h DB 01H
-__65BE04AA_processenv@h DB 01H
-__4767CA46_fileapi@h DB 01H
-__282E6C4B_fileapifromapp@h DB 01H
-__393AF12C_debugapi@h DB 01H
-__EBC502B8_utilapiset@h DB 01H
-__1EAD8C69_handleapi@h DB 01H
-__D8EF9B29_errhandlingapi@h DB 01H
-__97FC1204_fibersapi@h DB 01H
-__27448220_namedpipeapi@h DB 01H
-__6EA33B2A_profileapi@h DB 01H
-__EAC6F673_heapapi@h DB 01H
-__D64EEA5A_ioapiset@h DB 01H
-__144BD4B6_synchapi@h DB 01H
-__03B1C640_interlockedapi@h DB 01H
-__DC64CB38_processthreadsapi@h DB 01H
-__D719B518_sysinfoapi@h DB 01H
-__410385B1_memoryapi@h DB 01H
-__C1AD45EF_enclaveapi@h DB 01H
-__F4C3AA32_threadpoollegacyapiset@h DB 01H
-__AC5A7A9F_threadpoolapiset@h DB 01H
-__F5254B21_jobapi@h DB 01H
-__BCEA6EE8_jobapi2@h DB 01H
-__D18ACE72_wow64apiset@h DB 01H
-__669B0D4A_libloaderapi@h DB 01H
-__645F7034_securitybaseapi@h DB 01H
-__67E58557_namespaceapi@h DB 01H
-__599D9D3A_systemtopologyapi@h DB 01H
-__2337E373_processtopologyapi@h DB 01H
-__02BFF239_securityappcontainer@h DB 01H
-__9C196272_realtimeapiset@h DB 01H
-__5AB313A4_winerror@h DB 01H
-__B7E7187B_timezoneapi@h DB 01H
-__6DE9EB6F_winbase@h DB 01H
-__56B2AFF2_wingdi@h DB 01H
-__BA1161A9_tvout@h DB 01H
-__0501A018_winuser@h DB 01H
-__EF12FA99_datetimeapi@h DB 01H
-__8FA7C3CA_winnls@h DB 01H
-__390F0C47_stringapiset@h DB 01H
-__28605B0A_wincontypes@h DB 01H
-__BFBDE86D_consoleapi@h DB 01H
-__C3CAFBF0_consoleapi2@h DB 01H
-__C20891C7_consoleapi3@h DB 01H
-__717C98B6_wincon@h DB 01H
-__2884C177_verrsrc@h DB 01H
-__A3FD3A34_winver@h DB 01H
-__6F8AD9F1_reason@h DB 01H
-__4C90FD6F_winreg@h DB 01H
-__68AFEBAD_wnnc@h DB 01H
-__5A7AB086_winnetwk@h DB 01H
-__2FE8A10C_stralign@h DB 01H
-__34558472_winsvc@h DB 01H
-__058845F1_mcx@h DB 01H
-__7F16006B_ime_cmodes@h DB 01H
-__0A3AF599_imm@h DB 01H
-__9349FE86_windows@h DB 01H
+__E4C945B4_corecrt_memcpy_s@h DB 01H
+__8EAFF484_corecrt_memory@h DB 01H
+__6490AEC5_corecrt_wstring@h DB 01H
+__E8295E1E_string@h DB 01H
+__7FCB5136_guiddef@h DB 01H
+__FF8A9E11_pshpack4@h DB 01H
+__D5438902_poppack@h DB 01H
+__FB07E2A3_pshpack2@h DB 01H
+__F6906775_pshpack8@h DB 01H
+__F9415CFA_pshpack1@h DB 01H
+__E58C6F1C_apiset@h DB 01H
+__A5C52262_ktmtypes@h DB 01H
+__FBBA8F9D_winnt@h DB 01H
+__A32D3D2C_minwindef@h DB 01H
+__7D798299_windef@h DB 01H
+__9AE108E9_apisetcconv@h DB 01H
+__9CE53D2C_minwinbase@h DB 01H
+__5D0AA210_apiquery2@h DB 01H
+__4DD4E726_processenv@h DB 01H
+__3575CC96_fileapi@h DB 01H
+__8EA220E6_fileapifromapp@h DB 01H
+__BF9B31FE_debugapi@h DB 01H
+__C3AFE134_utilapiset@h DB 01H
+__76F69E51_handleapi@h DB 01H
+__7E63D784_errhandlingapi@h DB 01H
+__FFA7003C_fibersapi@h DB 01H
+__8971CECF_namedpipeapi@h DB 01H
+__46C9D8A6_profileapi@h DB 01H
+__98D4F0A3_heapapi@h DB 01H
+__50EF2A88_ioapiset@h DB 01H
+__92EA1464_synchapi@h DB 01H
+__A53D8AED_interlockedapi@h DB 01H
+__B506CAAF_processthreadsapi@h DB 01H
+__FF735694_sysinfoapi@h DB 01H
+__29589789_memoryapi@h DB 01H
+__E9C7A663_enclaveapi@h DB 01H
+__D035F9F7_threadpoollegacyapiset@h DB 01H
+__C899130C_threadpoolapiset@h DB 01H
+__E0441EE7_jobapi@h DB 01H
+__CEF86838_jobapi2@h DB 01H
+__35AC6B9A_wow64apiset@h DB 01H
+__C8AE41A5_libloaderapi@h DB 01H
+__CC9E232D_securitybaseapi@h DB 01H
+__C9D0C9B8_namespaceapi@h DB 01H
+__30FF9CAD_systemtopologyapi@h DB 01H
+__4D358795_processtopologyapi@h DB 01H
+__40446D10_securityappcontainer@h DB 01H
+__3A952EDF_realtimeapiset@h DB 01H
+__F4865F4B_winerror@h DB 01H
+__53C1BD93_timezoneapi@h DB 01H
+__1FFBEDBF_winbase@h DB 01H
+__43D3FA34_wingdi@h DB 01H
+__D24A7391_tvout@h DB 01H
+__7713A6C8_winuser@h DB 01H
+__0B345F71_datetimeapi@h DB 01H
+__9AC6960C_winnls@h DB 01H
+__973A40A8_stringapiset@h DB 01H
+__CC46FEE2_wincontypes@h DB 01H
+__97D70BE1_consoleapi@h DB 01H
+__27EC5E18_consoleapi2@h DB 01H
+__262E342F_consoleapi3@h DB 01H
+__641DCD70_wincon@h DB 01H
+__5A96C7A7_verrsrc@h DB 01H
+__B69C6FF2_winver@h DB 01H
+__7AEB8C37_reason@h DB 01H
+__59F1A8A9_winreg@h DB 01H
+__EE0E2B7F_wnnc@h DB 01H
+__DCDB7054_winnetwk@h DB 01H
+__81DDEDE3_stralign@h DB 01H
+__2134D1B4_winsvc@h DB 01H
+__11C07376_mcx@h DB 01H
+__577CE3E7_ime_cmodes@h DB 01H
+__1E72C31E_imm@h DB 01H
+__E15BF856_windows@h DB 01H
 __639A050C_sn_internal@h DB 01H
-__60B45B40_corecrt_stdio_config@h DB 01H
-__CFA3741E_corecrt_wstdio@h DB 01H
-__B3FE3303_stdio@h DB 01H
-__955456CD_stddef@h DB 01H
-__99AED4FB_corecrt_search@h DB 01H
-__8B813BF6_corecrt_wstdlib@h DB 01H
+__44420885_corecrt_stdio_config@h DB 01H
+__AB601D8D_corecrt_wstdio@h DB 01H
+__C1EC35D3_stdio@h DB 01H
+__13F5961F_stddef@h DB 01H
+__FD6DBD68_corecrt_search@h DB 01H
+__E2E33A61_corecrt_wstdlib@h DB 01H
 __3D1CA2C3_limits@h DB 01H
-__E8FB0A68_stdlib@h DB 01H
+__6E5ACABA_stdlib@h DB 01H
 __C363A436_stb_image@h DB 01H
 __836A8CFC_stdint@h DB 01H
 __C95DC661_khrplatform@h DB 01H
@@ -131,7 +131,7 @@ __DB8D0340_nmmintrin@h DB 01H
 __0E36F90E_wmmintrin@h DB 01H
 __C5A2B409_zmmintrin@h DB 01H
 __F2B616C3_immintrin@h DB 01H
-__9FB25DBE_assert@h DB 01H
+__19139D6C_assert@h DB 01H
 __4E664295_glfw_function@h DB 01H
 __64C0EF11_StgSharpNative@h DB 01H
 __AE0F26BF_dllmain@c DB 01H