diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-01-11 02:35:38 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-01-11 02:35:38 +0100 |
| commit | 85eea96a3159c41b6630fd26d6f090484a131460 (patch) | |
| tree | 9b1c9aadc16c28b2e7851c975cda4224c2c1b965 /tests/alloca2.test | |
| parent | ad748b8323dd2bac0dd61ac17c72ad363c68055c (diff) | |
| parent | 73b74f839340b94dad94f090e7d8291064104d0d (diff) | |
| download | automake-85eea96a3159c41b6630fd26d6f090484a131460.tar.gz | |
Merge branch 'maint'
Conflicts:
ChangeLog
Apparently I messed up doing a previous 'git pull', so that the "latest"
maint I've merged into master (and pushed!) wasn't a fast-forward from
origin/maint. Yay for me. This merge should help cleaning up the mess.
Diffstat (limited to 'tests/alloca2.test')
0 files changed, 0 insertions, 0 deletions