Context Navigation

Makefile.am

Timestamp:

Sep 7, 2022, 5:26:35 PM (4 years ago)

Author:

eugene

Message:

merging changes from tags/ipp-ops-20220705 (add new gpc1 format to support SHMDOUTC)

Location:

trunk

Files:

Property svn:mergeinfo set to (toggle deleted branches)

/branches/czw_branch/20160809/ippconfig/gpc2/Makefile.am	merged	eligible
/branches/czw_branch/20170908/ippconfig/gpc2/Makefile.am	merged	eligible
/branches/eam_branches/ipp-20191011/ippconfig/gpc2/Makefile.am	merged	eligible
/branches/eam_branches/ipp-20211108/ippconfig/gpc2/Makefile.am	merged	eligible
/branches/eam_branches/ipp-dev-20210817/ippconfig/gpc2/Makefile.am	merged	eligible
/branches/ipp-390_update_CHIP_DARKTEST_recipes/gpc2/Makefile.am	merged	eligible
/branches/ipp-476_gpc2_darktests_with_continuity_on/gpc2/Makefile.am	merged	eligible
/branches/ipp-482_increase_psastro_sigma_threshold/gpc2/Makefile.am	merged	eligible
/tags/ipp-ops-20220303-rc/ippconfig/gpc2/Makefile.am	merged	eligible
/tags/ipp-ops-20220705/ippconfig/gpc2/Makefile.am	merged	eligible
/tags/ipp-ps1-20210510/ippconfig/gpc2/Makefile.am	merged	eligible
/tags/ipp-ps1-20210708/ippconfig/gpc2/Makefile.am	merged	eligible
/tags/ipp-ps2-20190404/ippconfig/gpc2/Makefile.am	merged	eligible
/trunk/ippconfig/gpc2/Makefile.am	merged	eligible
/branches/ipp-388_adding_darktest_recipe/gpc2/Makefile.am	41182-41185
/ipp-ps2-20190404/ippconfig/gpc2/Makefile.am	40668

Note: See TracChangeset for help on using the changeset viewer.

/tags/ipp-ops-20220303-rc (added)	merged: 42107,42111,42120-42121,42123
/tags/ipp-ops-20220705 (added)	merged: 42234,42236-42237,42239-42240,42244-42252,42256,42263,42284

/tags/ipp-ops-20220303-rc/ippconfig (added)	merged: 42111
/tags/ipp-ops-20220705/ippconfig (added)	merged: 42236-42237,42239-42240,42244-42246,42248-42251,42284