Tomasz Kapuściński 3bd4fee844 Merge branch 'dev' into dev-graphics-overhaul ... # Conflicts: # src/graphics/engine/camera.cpp # src/object/auto/autonuclearplant.cpp # src/object/auto/autopowerplant.cpp # src/object/interface/powered_object.h # src/object/motion/motionvehicle.cpp # src/object/old_object.cpp # src/object/old_object.h # src/object/task/taskmanip.cpp # src/object/task/taskmanip.h # src/object/task/tasktake.cpp		2022-02-02 18:11:06 +01:00
..
cbot	Update license headers	2021-09-11 15:53:59 +02:00
unit	Merge branch 'dev' into dev-graphics-overhaul	2022-02-02 18:11:06 +01:00
CMakeLists.txt	Remove support for MXE	2021-09-04 21:52:58 +02:00