mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Conflicts: addons/attach/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/magazinerepack/stringtable.xml addons/overheating/stringtable.xml extensions/CMakeLists.txt