Merge branch 'dev'

renhao

2023-10-12 df6e56c65e758b5a5e7b28bb9192575710a76c47

1
2
3
4
5
6
7
8
Quintiq file version 2.0
#root
#parent: MacroPlanner
OrphanComponent GlobalStateMacroPlanner
{
  #keys: '[119640.1.1203465130]'
  BaseType: 'GlobalState'
}