Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/PgBlowing · dev-7.0-1 · 潘栩锋 / hemei · GitLab

History Find file

Merge remote-tracking branch 'remotes/origin/dev-7.0-1' into feature-feng-multiLang-20240413 · bb5bc881
潘栩锋 authored May 20, 2024
```
# Conflicts:
#	Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/PgBlowing/PgBlowingExtVm.cs
#	hemei.sln
```
bb5bc881

Name	Last commit	Last update
..
BlowingDetectCore.cs		Loading commit data...
CalFilmLen.cs		Loading commit data...
PgBlowing.xaml		Loading commit data...
PgBlowing.xaml.cs		Loading commit data...
PgBlowingExt.xaml		Loading commit data...
PgBlowingExt.xaml.cs		Loading commit data...
PgBlowingExtVm.cs		Loading commit data...
PgBlowingExtVmUt.cs		Loading commit data...
PgBlowingVm.cs		Loading commit data...
PgBlowingVmUt.cs		Loading commit data...