Merge remote-tracking branch 'upstream/main' into feature/mixedPolytrope
# Conflicts: # .gitignore # build-config/meson.build # meson.build # meson_options.txt # src/composition/public/composition.h # src/config/public/config.h # src/constants/public/const.h # src/meson.build # tests/composition_sandbox/comp.cpp
This commit is contained in:
@@ -22,3 +22,6 @@ subdir('resource')
|
||||
# Physics Libraries
|
||||
subdir('network')
|
||||
subdir('polytrope')
|
||||
|
||||
# Python Bindings
|
||||
subdir('python')
|
||||
|
||||
Reference in New Issue
Block a user