Skip to content

Merge remote-tracking branch 'origin/master'

willll requested to merge std_array_into_resource into master

As discussed ... (lazy boys are ... lazy)

Conflicts:

src/engine.hpp

src/resource.cpp

src/resource.hpp

Merge request reports