]> git.ipfire.org Git - thirdparty/automake.git/commit
projects / thirdparty / automake.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d396d84 b64c1f4)
Merge branch 'origin/ng/master' into 'ng/master'.
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 24 Nov 2012 13:08:46 +0000 (14:08 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 24 Nov 2012 13:08:46 +0000 (14:08 +0100)
commitc95017c8a2ebf9afcd63892d50ca51503a17c4a3
treef135795068786e413bed09567fef14d03965a902tree
parentd396d841c5e172eb5cc852ccfb36c2a7624c8e53commit | diff
parentb64c1f41633729250d2b7184359b673f17ce29b2commit | diff
Merge branch 'origin/ng/master' into 'ng/master'.

Hmph, I did a merge of 'master' into 'ng/master' without pulling first,
so I missed earlier changes to 'ng/master' that were in the central
repository but not in my local repository.  Since that merge required
some non-trivial conflicts resolutions, I don't want to redo it; I'm
thus merging the 'ng/master' from the central repository to the local
one "after the fact".
Mirror of https://github.com/autotools-mirror/automake.git