Merge branch 'save_ext' into infrastructure_sharing-sx
Conflicts: src/saveload/saveload.cpp
This commit is contained in:
@@ -2775,6 +2775,14 @@
|
||||
RelativePath=".\..\src\saveload\waypoint_sl.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\..\src\saveload\extended_ver_sl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\..\src\saveload\extended_ver_sl.cpp"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Tables"
|
||||
|
||||
Reference in New Issue
Block a user