Merge branch 'master' into add-river-layout

This commit is contained in:
Alexander Courtis
2023-02-11 13:22:46 +11:00
72 changed files with 1595 additions and 619 deletions

View File

@ -1,7 +1,7 @@
#pragma once
#include <json/json.h>
#ifdef HAVE_LIBDATE
#if defined(HAVE_CHRONO_TIMEZONES) || defined(HAVE_LIBDATE)
#include "modules/clock.hpp"
#else
#include "modules/simpleclock.hpp"