summaryrefslogtreecommitdiff
path: root/global.mk
diff options
context:
space:
mode:
authorAdrian Kummerlaender2019-06-24 15:49:04 +0200
committerAdrian Kummerlaender2019-06-24 15:55:59 +0200
commit1477bbe177da4d3ad07877d4b672aac4828d0a13 (patch)
treefa001f2be8cd2606ef469f177cb71860db72ef5e /global.mk
parentd316b74c25ea98d0145a9adad4ff9953f07581e4 (diff)
downloadgrid_refinement_openlb-1477bbe177da4d3ad07877d4b672aac4828d0a13.tar
grid_refinement_openlb-1477bbe177da4d3ad07877d4b672aac4828d0a13.tar.gz
grid_refinement_openlb-1477bbe177da4d3ad07877d4b672aac4828d0a13.tar.bz2
grid_refinement_openlb-1477bbe177da4d3ad07877d4b672aac4828d0a13.tar.lz
grid_refinement_openlb-1477bbe177da4d3ad07877d4b672aac4828d0a13.tar.xz
grid_refinement_openlb-1477bbe177da4d3ad07877d4b672aac4828d0a13.tar.zst
grid_refinement_openlb-1477bbe177da4d3ad07877d4b672aac4828d0a13.zip
Fix rebase conflictsHEADmaster
Diffstat (limited to 'global.mk')
-rw-r--r--global.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/global.mk b/global.mk
index 79cedc9..c301a88 100644
--- a/global.mk
+++ b/global.mk
@@ -72,7 +72,7 @@ SUBDIRS := src/boundary \
src/communication \
src/dynamics \
src/contrib \
- src/contrib/functors \
+ src/contrib/refinement \
src/core \
src/geometry \
src/external/tinyxml \