tree 34bf15f34815e904fc426bf6f5eda0e28403e4f6
parent 89a93348d514ff8c4233d8e25ebe2ff65e26c446
parent c829f0cfcaa4753743fde1900091e1233c41350b
author Brad King <brad.king@kitware.com> 1579875586 +0000
committer Kitware Robot <kwrobot@kitware.com> 1579875595 -0500

Merge topic 'trace_json_timestamp'

c829f0cfca trace: Add time and stack level to JSON output format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Volo Zyko <volo.zyko@gmail.com>
Merge-request: !4242