Files · 5f7f135cac542cc00fc314a1b49fa29f1aead4f4 · 潘栩锋 / Thick-Common

Merge remote-tracking branch 'remotes/gitlab/feature-feng-segmentLen-20200316'… · 5f7f135c

潘栩锋 authored 4 years ago

Merge remote-tracking branch 'remotes/gitlab/feature-feng-segmentLen-20200316' into feature-feng-updateMahApp-20201203

# Conflicts:
#	Project.FLY.FlyADBase/FlyADBase/FlyAD7.cs

5f7f135c

Name	Last commit	Last update
MultiLayout	修复 MultiLayout 编辑界面框，字太长，无法显示完	4 years ago
Project.FLY.AppHelper	1.全部项目改为 .net framework 4.6.1	5 years ago
Project.FLY.ControlLibrary	DynamicResource 改为 StaticResource	4 years ago
Project.FLY.FObjSys	Merge remote-tracking branch 'remotes/gitlab/dev6.0' into feature-feng-updateMahApp-20201203	4 years ago
Project.FLY.FlyADBase	Merge remote-tracking branch 'remotes/gitlab/feature-feng-segmentLen-20200316' into feature-feng-updateMahApp-20201203	4 years ago
Project.FLY.Misc	1. 升级升级MahApp 导致很多Style Brush 要改	4 years ago
Project.FLY.ModbusMapper	1. 升级升级MahApp 导致很多Style Brush 要改	4 years ago
Project.FLY.ModbusModule	升级 packages.config	5 years ago
Project.FLY.OBJComponents/OBJComponents	添加 BulkDbSQLite 的只有 DbT 版本	4 years ago
Project.FLY.Thick.Base	Merge remote-tracking branch 'remotes/gitlab/feature-feng-segmentLen-20200316' into feature-feng-updateMahApp-20201203	4 years ago
Project.FLY.Thick.BulkData	1.修改 DynamicResource 都改为 StaticResource	4 years ago
Project.SQLiteHelper	1. 升级升级MahApp 导致很多Style Brush 要改	4 years ago
UnityConfigurationTree	1. 升级升级MahApp 导致很多Style Brush 要改	4 years ago
dll	修改升级LiveCharts，Column2Series.YAxisCrossing 有bug	4 years ago
读取xmind/WpfApp1	修复 XMind 转unity 文件名忘记 Trim()	4 years ago
.gitattributes	第1次提交	6 years ago
.gitignore	第1次提交	6 years ago