Merge commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Nov 2013 00:52:55 +0000 (01:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Nov 2013 01:09:16 +0000 (02:09 +0100)
commit875f9aea3ea0614061e03363cf832f9047a683c9
tree9b00c7245418c35d6a9e8a3ffb5013ea540619ad
parent6d9dad6a7cb5d544d540abf941fedbd34c14d2bd
parentdc80e2f7a529d6e4416b40b68699be16fed62d6c
Merge commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c'

* commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c':
  Makefile: Fix building programs on systems with a nonempty executable suffix

Conflicts:
Makefile

See: f1db007e008d3ece791c7ac65c537d1d301ea0cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Makefile
doc/Makefile