commit b6a30aea4a0a19d2b88051bbe5cec065cd577bb9
Merge: c20b2ff 0dd95c8
Author: Stefano Lattarini <[email protected]>
Date: Fri May 10 15:55:04 2013 +0200
Merge branch 'master' into tmp-for-master-merge
* master:
automake: typofix in comments: s/AC_CONFIG_HEADER/AC_CONFIG_HEADERS/
build: move automake and aclocal in 'bin' subdir
build: break up monolithic Makefile.am in subdir-specific fragments
This leaves the tree in a partially-inconsistent state. We will fix
the situation with follow-up patches.
Signed-off-by: Stefano Lattarini <[email protected]>
