Conflicts: library/xml plugins/isoworld plugins/rendermax/CMakeLists.txt plugins/rendermax/renderer_light.cpp plugins/rendermax/renderer_light.hpp plugins/rendermax/renderer_opengl.hpp plugins/rendermax/rendermax.cpp plugins/rendermax/rendermax.lua |
||
---|---|---|
.. | ||
.gitignore | ||
RemoteFortressReader.proto | ||
isoworldremote.proto | ||
rename.proto | ||
stockpiles.proto |