Merge branch 'feature/nm-para-property-20260615' into develop

Browse Source

# Conflicts:
#	Bin/Config/Common/ModelParaDefinesNM_cn.dat   resolved by develop version
#	Bin/Config/Common/ModelParaDefinesNM_en.dat   resolved by develop version
#	Bin/XmlFiles/ModelParaDefinesNM_cn.xml
#	Bin/XmlFiles/ModelParaDefinesNM_en.xml
#	Include/nmNum/nmGUI/nmGridRowUtils.h
#	Src/nmNum/nmData/nmDataAnalyzeManager.cpp
#	Src/nmNum/nmGUI/nmGridRowUtils.cpp
#	Src/nmNum/nmPlot/nmGuiPlot.cpp
#	Src/nmNum/nmSubWnd/nmSubWndUtils.cpp

develop

lvjunjie 14 hours ago

parent 0a1350b188 e0777157df

commit 4e4ccd9462

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

Diff Content Not Available