Merge commit 'd791e8c990a752435d993df01516ebe469d94535' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 12:20:35 +0000 (14:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 12:20:35 +0000 (14:20 +0200)
commited9ab30f4cca55f0306fb91ad79562f1de4d3bb7
tree6f87f79b763f57e79bf5b47d1976a0ff2720df8d
parent1fabe4ae8cc07d80c735bb45858f542bb0aea944
parentd791e8c990a752435d993df01516ebe469d94535
Merge commit 'd791e8c990a752435d993df01516ebe469d94535' into release/1.1

* commit 'd791e8c990a752435d993df01516ebe469d94535':
  doc: Point to the correct, actually maintained gas-preprocessor repo

Conflicts:
doc/platform.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/platform.texi