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 |
||
|---|---|---|
| .. | ||
| clsocket@178a4916da | ||
| lua | ||
| md5 | ||
| protobuf | ||
| tinyxml | ||
| tthread | ||
| zlib | ||
| CMakeLists.txt | ||