Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Jul 2011 22:34:34 +0000 (00:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Jul 2011 22:34:47 +0000 (00:34 +0200)
commit8400607267458371398b0d3f170b6c0d9c688453
tree9718930996019f0c92959c5a7cf90f649e615ed4
parent3b5ddf07c0c4ab6a0d347d92ff8d9cfbac6b66ed
parent8a54bfe83f3387072fb2044096d073c973739ed1
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: make examples build normally

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