Merge commit '9485cce6d55baf547e92ef1f54cad117f2a38287'
authorJames Almer <jamrial@gmail.com>
Thu, 2 May 2019 16:48:43 +0000 (13:48 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 2 May 2019 16:48:43 +0000 (13:48 -0300)
commite645d7a6d452df83cedcbb1d6708429ceea156da
tree39680d2feda28341f015b9438c2224d424284f44
parent67d466d09b105b2b1d3d8da4c21d8975925741ae
parent9485cce6d55baf547e92ef1f54cad117f2a38287
Merge commit '9485cce6d55baf547e92ef1f54cad117f2a38287'

* commit '9485cce6d55baf547e92ef1f54cad117f2a38287':
  time_internal: Do not attempt to override *time_r() macros

This commit is a noop, see a604de4fd89e8fe37d2f8163282060fcaa64ee3e

Merged-by: James Almer <jamrial@gmail.com>