ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-03 14:23:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'refs/heads/master' into apiX

Browse source 
# Conflicts:
#	Dalamud/Game/Libc/LibcFunction.cs
#	Dalamud/Game/Libc/LibcFunctionAddressResolver.cs
#	Dalamud/Game/Libc/OwnedStdString.cs
#	Dalamud/Game/Libc/StdString.cs
#	Dalamud/Interface/UiBuilder.cs
This commit is contained in:
Kaz Wolfe 2024-04-28 11:54:54 -07:00
commit b32ed39826
No known key found for this signature in database
GPG key ID: 258813F53A16EBB4
297 changed files with 768 additions and 543 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Logging/Internal/SerilogEventSink.cs
View file

@ -1,5 +1,3 @@
using System;
using Serilog.Core;
using Serilog.Events;

3
Dalamud/Logging/Retention/RetentionBehaviour.cs
View file

@ -1,5 +1,4 @@
using System;
using System.IO;
using System.IO;
using Serilog;

1
Dalamud/Logging/ScopedPluginLogService.cs
View file

@ -2,6 +2,7 @@
using Dalamud.IoC.Internal;
using Dalamud.Plugin.Internal.Types;
using Dalamud.Plugin.Services;
using Serilog;
using Serilog.Core;
using Serilog.Events;