Merge remote-tracking branch 'origin/dev' into dev_BB_in_Spine_VabiSys
# Conflicts: # .spinetoolbox/items/bb_parameters/filter_config.json # .spinetoolbox/items/bb_sets/filter_config.json # .spinetoolbox/project.json # spineToolbox.json # timeAndSamples_temp.inc # tools/bb1.3_to_spinedb.json # tools/bb_base_sets.json
1_options_temp.gms
0 → 100644
CHANGELOG.md
0 → 100644
COPYING
0 → 100644
This diff is collapsed.
COPYING.LESSER
0 → 100644
Notes.md
deleted
100644 → 0
README.md
0 → 100644