Skip to content
Snippets Groups Projects
Commit 8a290007 authored by Abhinav Singh's avatar Abhinav Singh
Browse files

Merge remote-tracking branch 'origin/develop' into FD_solver

# Conflicts:
#	openfpm_io
#	openfpm_numerics
parents 43ca758f 38e2045d
No related branches found
No related tags found
No related merge requests found
[submodule "openfpm_vcluster"]
path = openfpm_vcluster
url = ssh://git@git.mpi-cbg.de/openfpm/openfpm_vcluster.git
url = ../openfpm_vcluster.git
[submodule "openfpm_devices"]
path = openfpm_devices
url = ssh://git@git.mpi-cbg.de/openfpm/openfpm_devices.git
url = ../openfpm_devices.git
[submodule "openfpm_io"]
path = openfpm_io
url = ssh://git@git.mpi-cbg.de/openfpm/openfpm_io.git
url = ../openfpm_io.git
[submodule "openfpm_data"]
path = openfpm_data
url = ssh://git@git.mpi-cbg.de/openfpm/openfpm_data.git
url = ../openfpm_data.git
[submodule "openfpm_numerics"]
path = openfpm_numerics
url = ssh://git@git.mpi-cbg.de/openfpm/openfpm_numerics.git
url = ../openfpm_numerics.git
[submodule "gdbgui"]
path = gdbgui
url = https://github.com/incardon/gdbgui.git
......@@ -394,6 +394,4 @@ include(CPack)
cpack_add_component(OpenFPM
DISPLAY_NAME OpenFPM
DESCRITION OpenFPM binary files)
DESCRITION OpenFPM binary files)
\ No newline at end of file
Subproject commit c8048e7898e3a20d1ad1749d82d750e743247d8a
Subproject commit b213761e4cfeec08d1cf3c40041896eeb76282c9
Subproject commit 5cf2130f7af25a3c7da6e43301a429e2f1640ef0
Subproject commit 50dd6fbacfde2a36698d023a0eed709bc96b54bc
Subproject commit 36506fb6de31f03908cae35fa2f53773fe197816
Subproject commit eb5cc8eaac9e5da6b16902b16cc472dde4e8f746
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment