Merge branch 'dev_yx' into dev

yypsybs

2023-09-25 99efdc3a1d2a85c727e48e32d96866a524fb59ed

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