Merge commit '56dea32f09e71460add14a1b6d0fbe6eb16f02a4'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Feb 2013 12:41:24 +0000 (13:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Feb 2013 12:41:24 +0000 (13:41 +0100)
commit08db519e1275d301417be0013ef3eb03e9381935
tree72419e876bc2704d69a3643a0dca62d50f574f5a
parent7491356111e7f171b6cd4f23a8d8fb32439485ca
parent56dea32f09e71460add14a1b6d0fbe6eb16f02a4
Merge commit '56dea32f09e71460add14a1b6d0fbe6eb16f02a4'

* commit '56dea32f09e71460add14a1b6d0fbe6eb16f02a4':
  doc: developer: Fix wording in "naming conventions" section
  openbsd: Add minor number to shared library install name

Conflicts:
doc/developer.texi

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