Merge commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Sep 2013 11:41:33 +0000 (13:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Sep 2013 11:42:37 +0000 (13:42 +0200)
commitd8809b357c5ee3a760262b17bc7f97ecb876cb96
tree7c2a0fb918f6d1cf1a971597600d90c585ff1996
parent67d7ea9825f6c3dfae5323c5252dbc602acddd1d
parentf4ca970dba13a60a1334cce1b574036e6f624b9c
Merge commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c'

* commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c':
  configure: Add docdir configuration option

Conflicts:
configure
doc/Makefile

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