Commit [931831]  Maximize  Restore  History

1.4.3.1 merged the Template_133 Branch

Merge commit 'e18d4ddd8ad29602f966b4e5f9e2cda03a367e62'

Conflicts:
project/library_information_c8706b13/getlibversion_d754badd/d754baddb8c85d3b840b2496c8e67b65.object
project/library_information_c8706b13/getlibversionnumber_e5561e6b/e5561e6be4a352c2afe2127b8d3ac083.object
project/project_information_11c0fc3a/11c0fc3a9bcf4dd8ac38efb93363e521.object
project/project_information_401df53a/getversion_2fb5a435/2fb5a4354d435674b7e5b5caa6f2922f.object
project/project_information_401df53a/getversionproperty_b83afbb8/b83afbb8937057ec8097c83762f87191.object
project/sparkplug™_mqtt_edge_and_host-stack_b9741afd/function_blocks_8ad6e219/fb_payloadsimple_87cbd74b/fb_payloadsimpleencoder_1f607d29/1f607d294c3d4ff9917a3446e8ba16b7.object
project/sparkplug™_mqtt_edge_and_host-stack_b9741afd/function_blocks_8ad6e219/fb_sparkplugbsimple_c978db11/fb_sparkplugbsimple_b276ae31/b276ae31a54c4d6f8b78cab400d0ac12.object
project/sparkplug™_mqtt_edge_and_host-stack_b9741afd/functions_a1970cad/addchangestopayload_75f9c1a9/75f9c1a90f3942adabcf3b9ec23d7825.object
project/sparkplug™_mqtt_edge_and_host-stack_b9741afd/functions_a1970cad/update_31edffc0/31edffc02e57461899bbb6dfab0656b1.object
project/sparkplug™_mqtt_edge_and_host-stack_b9741afd/globalvariables_fe17f240/gvl_sparkplug_f411f020/f411f0207f68479db89e34c1bc7ad920.object

i-campbell i-campbell 2022-03-26

Browse code at this revision

Parents: [ba76bd][e18d4d]

Children: [1f5407][2c693b]