Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Jun 2011 01:26:38 +0000 (03:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Jun 2011 02:30:19 +0000 (04:30 +0200)
commitd127d26997ff046a9f112643eebd1007590b4fa2
treebdfe95a65bb300bd240e6c897ec43ce68cd0f30a
parent2291e18e4891066bbcbcd1a4e468a59a40e9cb5c
parent151c5841881591552be685b7fd50b488f128ba5b
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: fix "make install" with documentation disabled
  build: simplify some conditional targets

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