merge develop make target

tcgoetz · tcgoetz · commit 6a0159eddf0a · 2024-02-19T08:30:37.000-06:00
diff --git a/Fit b/Fit
@@ -1 +1 @@
-Subproject commit 52e63d09aeea9a5bff7dfa66aeea03ad51c7ecfd
+Subproject commit b2960de444dc8f6d053716f8fb2d26f945b46379
diff --git a/Makefile b/Makefile
@@ -329,4 +329,8 @@ regression_test: clean regression_test_run test
 bugreport:
 	./bugreport.sh
 
-.PHONY: all setup install install_all uninstall uninstall_all update deps create_dbs rebuild_dbs update_dbs clean clean_dbs test zip_packages release clean test test_clean daily flake8 $(SUBMODULES:%=%-flake8)
+
+merge_develop:
+	git fetch --all && git merge remotes/origin/develop
+
+.PHONY: all setup install install_all uninstall uninstall_all update deps create_dbs rebuild_dbs update_dbs clean clean_dbs test zip_packages release clean test test_clean daily flake8 $(SUBMODULES:%=%-flake8) merge_develop
diff --git a/Plugins b/Plugins
@@ -1 +1 @@
-Subproject commit 64b6129528cf8a86c72fec29b5e72bd7e8242f4d
+Subproject commit 5d817b8e856e121874b12869afbd00b17f87e0e6
diff --git a/Tcx b/Tcx
@@ -1 +1 @@
-Subproject commit 5f6ea93a5d9eb2bffedffd841c5b0e184494ba7c
+Subproject commit 277b2748d01df47e3d696e876c8a0947997e6162
diff --git a/utilities b/utilities
@@ -1 +1 @@
-Subproject commit 77fcc1815cf886ee9ff05045794d12a482ff06dd
+Subproject commit 5ce3f712f34818cddf5327cd827a480989ff6940
