On 03/07/2012 09:16 PM, Peter Rosin wrote:
> Stefano Lattarini skrev 2012-03-07 20:55:
>> On 03/07/2012 08:32 PM, Peter Rosin wrote:
>>
>>> currently needs to be made on the non-obvious msvc branch instead
>>> of on the more natural maint branch.
>>>
>> "instead of on" sounds a little forced to me (but I'm not a native, so
>> this might be a wrong impression); what about s/instead of/rather than/?
>
> I did s/instead of/and not/ instead. That seemed even clearer...
>
> So, this is what I ended up doing, and thanks for looking!
>
Thanks for finally having cleaned up this mess (which was mostly my fault).
I've pushed the minor fixlet below to maint, merged maint back into master
and branch-1.11, deleted the now-obsolete 'msvc' branch, and pushed.
Let's hope we're out of this merging swamp now :-)
Regards,
Stefano
-*-*-
commit 27f3c56209a91724b0d83d0dd655f0eae0a698a9
Author: Stefano Lattarini <stefano.lattar...@gmail.com>
AuthorDate: Wed Mar 7 22:14:47 2012 +0100
Commit: Stefano Lattarini <stefano.lattar...@gmail.com>
CommitDate: Wed Mar 7 22:14:47 2012 +0100
cosmetics: fix repeated changelog entry heading
diff --git a/ChangeLog.11 b/ChangeLog.11
index ba43734..880aaba 100644
--- a/ChangeLog.11
+++ b/ChangeLog.11
@@ -1,7 +1,5 @@
2011-12-27 Stefano Lattarini <stefano.lattar...@gmail.com>
-2011-12-27 Stefano Lattarini <stefano.lattar...@gmail.com>
-
tests: drop unnecessary requirement in 'subpkg.test'
* tests/subpkg.test ($required): Drop "bison", it is not required
anymore since commit `v1.11-502-g7e5ae80'.
