Merge commit '7a76c6c4df31d1ff65464ccf3171acd57ef004eb'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 19:38:08 +0000 (20:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 19:38:08 +0000 (20:38 +0100)
commit2ba0ef4b15ccfeb1b7dcdca7dcbcc0a3f77f18b8
tree359ed124774b05a0bbfe6629685efc2f8979d1cd
parent693b8f11d7fd7eb44177eed9cbbddf63f3fc6bdb
parent7a76c6c4df31d1ff65464ccf3171acd57ef004eb
Merge commit '7a76c6c4df31d1ff65464ccf3171acd57ef004eb'

* commit '7a76c6c4df31d1ff65464ccf3171acd57ef004eb':
  configure: Enable colored output for gcc 4.9+

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure