Merge branch 'master' of https://bitbucket.org/Regalis11/subsurface-private
Conflicts: Subsurface/Source/Characters/AI/Objectives/AIObjectiveManager.cs
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
<ErrorReportUrlHistory />
|
||||
<FallbackCulture>en-US</FallbackCulture>
|
||||
<VerifyUploadedFiles>false</VerifyUploadedFiles>
|
||||
<ProjectView>ProjectFiles</ProjectView>
|
||||
<ProjectView>ShowAllFiles</ProjectView>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ReferencePath>
|
||||
|
||||
Reference in New Issue
Block a user