diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-31 08:14:05 +0100 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-31 08:14:05 +0100 |
commit | bf95acc6d36aa5e898b8be506322d7d59d211f0a (patch) | |
tree | 8376332a8c697699243b4ded911c4d717d92ac2f | |
parent | 4fbec2fffe9d98470b3c5d1d03a94e32660366b0 (diff) | |
parent | 2a2f57fc8b5a10d82c6797b62b2c9244144c300e (diff) | |
parent | 32cde2a4722d25ad41e5ae2e33d43ceb2c6f4a90 (diff) | |
download | automake-bf95acc6d36aa5e898b8be506322d7d59d211f0a.tar.gz |
Merge branches 'msvc' and 'maint' into branch-1.11
* msvc:
ar-lib: ignore the verbose modifier instead of erroring out
scripts: cherry-pick recent changes from master
* maint:
tests: do not assume the object file extension is .o