]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58ed7b6 c9edbe4)
Merge commit 'c9edbe4af901e9bc9f05a62319637f9760df9a4a'
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 24 Jul 2015 18:02:37 +0000 (20:02 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 24 Jul 2015 18:02:48 +0000 (20:02 +0200)
* commit 'c9edbe4af901e9bc9f05a62319637f9760df9a4a':
  use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe

See: 58ed7b632842f3fedbe737c3945cabc56bab2f47
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

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