]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67d466d 9485cce)
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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.