Skip to content
GitLab
Commit ad1e02b8 authored by Andreas Fenkart's avatar Andreas Fenkart
Browse files

standard memory header included multiple times

parent 8db0fc19
master DSD-10252-heatbeat-increase-for-dutch-p1-support DSD-10490-crash DSD-11013-wrong-dutch-translation DSD-7417 JEAN_P1_MASTER MR_convert_deviceinterfaceqeuesthandler_test MR_device_AutomationInputMode_none MR_device_setBinaryType MR_drop_boost_filesystem MR_getModelFeatures2 MR_install_libds_as_shared_library MR_metering_storage MR_metering_webscocket MR_open_metering_system_archive MR_p1_metering MR_pairing-button_3 MR_prepare_public_api_sync MR_std--shared_ptr MR_sync_open_metering_system R2111 R2204 R2207 R2210 R2303 R2309 R2311 R2411 bugfix/DSD-10490-fix-crash bugfix/DSD-3172-support-umr200-config_3_7_0 cherry-pick-921e00cb cherry-pick-921e00cb-2 feature/DSD-10170-support-area-names jeanvisagie/dss-mainline-p1_crc mock_api_endpoints testing testing_safe update_ubuntu weather_api 1.19.11 1.19.11-beta01 1.19.10.1 1.19.10.1-beta01 1.19.10 1.19.9 1.19.9-beta03 1.19.9-beta02 1.19.9-beta01 1.19.8.1 1.19.8 1.19.8-beta03 1.19.8-beta02 1.19.8-beta01 1.19.7.1 1.19.7 1.19.7-beta07 1.19.7-beta06 1.19.7-beta05 1.19.7-beta04 1.19.7-beta03 1.19.7-beta02 1.19.7-beta01 1.19.6.3 1.19.6.2 1.19.6.1 1.19.6.1-beta01 1.19.6 1.19.6-beta03 1.19.6-beta02 1.19.6-beta01 1.19.5.1 1.19.5.1-beta02 1.19.5.1-beta01 1.19.5 1.19.5-beta03 1.19.5-beta02 1.19.5-beta01 1.19.4 1.19.4-beta04 1.19.4-beta03 1.19.4-beta02 1.19.4-beta01 1.19.3.1 1.19.3.1-beta01 1.19.3 1.19.3-beta06 1.19.3-beta05 1.19.3-beta04 1.19.3-beta03 1.19.3-beta02 1.19.3-beta01 1.19.2.1 1.19.2 1.19.2-beta02 1.19.2-beta01
2 merge requests!2581Merge branch 'master' into testing,!2570boost::shared_ptr -> std::shared_ptr
Hide whitespace changes
Inline Side-by-side
Showing
with 12 additions and 19 deletions
+12 -19
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment