[us-commits] [ehb54/ultrascan3] ce0e7b: Merge branch 'main' into 800-enhancement-nightly-b...

[aaron-auc]

  Branch: refs/heads/800-enhancement-nightly-build-using-vcpkg
  Home:   https://github.com/ehb54/ultrascan3
  Commit: ce0e7bc73c888397b643b77a02254123918c717f
      https://github.com/ehb54/ultrascan3/commit/ce0e7bc73c888397b643b77a02254123918c717f
  Author: aaron-auc <aaron at aucsolutions.com>
  Date:   2026-04-22 (Wed, 22 Apr 2026)

  Changed paths:
    M .gitignore
    M doc/manual/Makefile
    M doc/manual/source/2dsa/2dsa_analys.rst
    M doc/manual/source/2dsa/2dsa_main.rst
    M doc/manual/source/2dsa/index.rst
    A doc/manual/source/__pycache__/auto_index.cpython-39.pyc
    A doc/manual/source/_static/UltraScanIII.pdf
    A doc/manual/source/_static/images/cmenu_help.png
    A doc/manual/source/_static/images/load_us3.png
    A doc/manual/source/_static/images/reporter_comrep.png
    A doc/manual/source/_static/images/us_spectrum-0-upded.png
    M doc/manual/source/_static/images/us_spectrum-1.png
    M doc/manual/source/_static/js/sphinx_highlight.js
    M doc/manual/source/analysprof_general.rst
    M doc/manual/source/analyte/analyte_edit.rst
    M doc/manual/source/analyte/analyte_new.rst
    M doc/manual/source/analyte/analyte_settings.rst
    M doc/manual/source/astfem_sim.rst
    M doc/manual/source/buffer/buffer_edit.rst
    M doc/manual/source/buffer/buffer_new.rst
    M doc/manual/source/buffer/buffer_select.rst
    M doc/manual/source/buffer/buffer_settings.rst
    M doc/manual/source/buoyancy_editor.rst
    M doc/manual/source/combine_models.rst
    M doc/manual/source/common_dialogs.rst
    M doc/manual/source/conf.py
    M doc/manual/source/config.rst
    M doc/manual/source/convert.rst
    M doc/manual/source/dmga_init.rst
    M doc/manual/source/dmga_init_constr.rst
    M doc/manual/source/experiment/general.rst
    M doc/manual/source/experiment/import.rst
    M doc/manual/source/experiment/liveupdate.rst
    M doc/manual/source/experiment/range.rst
    M doc/manual/source/experiment/rotor.rst
    M doc/manual/source/experiment/solutions.rst
    M doc/manual/source/experiment/speeds.rst
    M doc/manual/source/export_legacy.rst
    M doc/manual/source/fe_match/fe_dmga_adv.rst
    M doc/manual/source/fe_match/fe_match_main.rst
    M doc/manual/source/fe_match/fe_match_simulate.rst
    M doc/manual/source/fe_match/index.rst
    M doc/manual/source/ga_initialize.rst
    M doc/manual/source/gmp/gmp_automation.rst
    M doc/manual/source/gmp/gmp_data_acquisition/gmp_data_acquisition_experiment.rst
    M doc/manual/source/gmp/gmp_data_acquisition/gmp_data_acquisition_gmp.rst
    M doc/manual/source/gmp/gmp_protocol_development.rst
    M doc/manual/source/grid_editor.rst
    M doc/manual/source/idist_combine.rst
    M doc/manual/source/index.rst
    M doc/manual/source/manage_data.rst
    M doc/manual/source/multi-wavelength/index.rst
    M doc/manual/source/multi-wavelength/mwl_species_fit.rst
    M doc/manual/source/multi-wavelength/mwl_species_sim.rst
    M doc/manual/source/multi-wavelength/mwl_spectra.rst
    M doc/manual/source/pcsa/pcsa.rst
    M doc/manual/source/pcsa/pcsa_analys.rst
    M doc/manual/source/pcsa/pcsa_results.rst
    M doc/manual/source/pseudo3d.rst
    M doc/manual/source/reporter.rst
    M doc/manual/source/rmsd_query.rst
    R doc/manual/source/rotor.rst
    M doc/manual/source/rotor_calibration.rst
    A doc/manual/source/rotors.rst
    M doc/manual/source/run_details.rst
    M doc/manual/source/second_moment.rst
    M doc/manual/source/simparams.rst
    M doc/manual/source/solutions/index.rst
    M doc/manual/source/solutions/solution_edit.rst
    M doc/manual/source/solutions/solution_new.rst
    M doc/manual/source/solutions/solution_settings.rst
    M doc/manual/source/start_page-int.rst
    M doc/manual/source/start_page-mw.rst
    M doc/manual/source/start_page-new.rst
    M doc/manual/source/start_page-rpt.rst
    M doc/manual/source/start_page.rst
    M doc/manual/source/time_derivative.rst
    M doc/manual/source/us_administrator.rst
    M doc/manual/source/us_buoyancy.rst
    M doc/manual/source/us_edit.rst
    M doc/manual/source/us_equiltime.rst
    M doc/manual/source/us_fds_filemanager.rst
    M doc/manual/source/us_investigator.rst
    M doc/manual/source/us_project.rst
    M doc/manual/source/us_spectrum.rst
    M doc/manual/source/vhw_combine.rst
    M doc/manual/source/vhw_enhanced.rst
    M doc/manual/source/xpn_viewer.rst
    M gui/us_abstractrotor_gui.h
    M gui/us_rotor_gui.h
    M utils/us_run_protocol.cpp

  Log Message:
  -----------
  Merge branch 'main' into 800-enhancement-nightly-build-using-vcpkg


  Commit: b61ed7ce96981f2cb26951cc5d14ba599e34ae18
      https://github.com/ehb54/ultrascan3/commit/b61ed7ce96981f2cb26951cc5d14ba599e34ae18
  Author: aaron-auc <aaron at aucsolutions.com>
  Date:   2026-04-22 (Wed, 22 Apr 2026)

  Changed paths:

  Log Message:
  -----------
  Merge branch '800-enhancement-nightly-build-using-vcpkg' of github.com:ehb54/ultrascan3 into 800-enhancement-nightly-build-using-vcpkg


Compare: https://github.com/ehb54/ultrascan3/compare/2d14470510d0...b61ed7ce9698

To unsubscribe from these emails, change your notification settings at https://github.com/ehb54/ultrascan3/settings/notifications