Conflicts: plugins/remotefortressreader.cpp |
||
---|---|---|
.. | ||
.gitignore | ||
RemoteFortressReader.proto | ||
isoworldremote.proto | ||
rename.proto |
Conflicts: plugins/remotefortressreader.cpp |
||
---|---|---|
.. | ||
.gitignore | ||
RemoteFortressReader.proto | ||
isoworldremote.proto | ||
rename.proto |