commit 29e8f26d6b3731a3dde85d34e8d7edca48f1e4ea
Merge: a3309f0 bfc83bd
Author: Stefano Lattarini <stefano.lattar...@gmail.com>
AuthorDate: Sat Dec 24 11:06:28 2011 +0100
Commit: Stefano Lattarini <stefano.lattar...@gmail.com>
CommitDate: Sat Dec 24 11:06:28 2011 +0100
Merge branch 'maint' into branch-1.11
* maint:
gitignore: use only one .gitignore file, in the top-level directory
tests: one more fixlet for gettext macros requirement
tests: fix handling of gettext macros requirement
commit d2fc8246603a665891b673d4a3b759e846232ff0
Merge: 54af9ca bfc83bd
Author: Stefano Lattarini <stefano.lattar...@gmail.com>
AuthorDate: Sat Dec 24 10:45:46 2011 +0100
Commit: Stefano Lattarini <stefano.lattar...@gmail.com>
CommitDate: Sat Dec 24 10:45:46 2011 +0100
Merge branch 'maint' into msvc
* maint:
gitignore: use only one .gitignore file, in the top-level directory
tests: one more fixlet for gettext macros requirement
tests: fix handling of gettext macros requirement
commit e3351076de09b744d3387699fa20f1ec85f9ba58
Merge: 3749d84 bfc83bd
Author: Stefano Lattarini <stefano.lattar...@gmail.com>
AuthorDate: Sat Dec 24 10:53:41 2011 +0100
Commit: Stefano Lattarini <stefano.lattar...@gmail.com>
CommitDate: Sat Dec 24 10:53:41 2011 +0100
Merge branch 'maint'
* maint:
gitignore: use only one .gitignore file, in the top-level directory
tests: one more fixlet for gettext macros requirement
tests: fix handling of gettext macros requirement
tests: fix failure due to debugging code forgotten into a test
commit a3f66de9d0d0126dbefb08a69ea2a326fc6a6649
Merge: c3bcf99 e335107
Author: Stefano Lattarini <stefano.lattar...@gmail.com>
AuthorDate: Sat Dec 24 11:05:24 2011 +0100
Commit: Stefano Lattarini <stefano.lattar...@gmail.com>
CommitDate: Sat Dec 24 11:05:24 2011 +0100
Merge branch 'master' into testsuite-work
* master:
gitignore: use only one .gitignore file, in the top-level directory
tests: one more fixlet for gettext macros requirement
tests: fix handling of gettext macros requirement
