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)
* qatar/master:
  build: make examples build normally

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

diff --cc subdir.mak
Simple merge