Alexander Bock 9b5c7b3080 Fix merge error

2025-03-10 14:31:04 +01:00

..

luascale.cpp

TimeFrame specification and status (#3553)

2025-03-10 13:53:32 +01:00

luascale.h

Happy new year

2025-01-14 16:21:08 +01:00

multiscale.cpp

TimeFrame specification and status (#3553)

2025-03-10 13:53:32 +01:00

multiscale.h

Make constructors explicit

2025-02-05 23:22:32 +01:00

nonuniformstaticscale.cpp

TimeFrame specification and status (#3553)

2025-03-10 13:53:32 +01:00

nonuniformstaticscale.h

Make constructors explicit

2025-02-05 23:22:32 +01:00

staticscale.cpp

TimeFrame specification and status (#3553)

2025-03-10 13:53:32 +01:00

staticscale.h

TimeFrame specification and status (#3553)

2025-03-10 13:53:32 +01:00

timedependentscale.cpp

TimeFrame specification and status (#3553)

2025-03-10 13:53:32 +01:00

timedependentscale.h

Make constructors explicit

2025-02-05 23:22:32 +01:00

timelinescale.cpp

Fix merge error

2025-03-10 14:31:04 +01:00

timelinescale.h

Add new class TimelineScale (#3536)

2025-03-06 13:06:19 +01:00