]> git.ipfire.org Git - thirdparty/gettext.git/commit
projects / thirdparty / gettext.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c84028b) | patch
Improve conflict resolution between gnulib and textstyle.h.
authorBruno Haible <bruno@clisp.org>
Sun, 20 Jun 2021 01:47:20 +0000 (03:47 +0200)
committerBruno Haible <bruno@clisp.org>
Sun, 20 Jun 2021 16:37:03 +0000 (18:37 +0200)
commit10faa7ec47994d90ec65da50d3ccdbc4a7cafdaa
treee7cf415dbf1e9242eacc14d6ea858db120072815tree | snapshot
parentc84028b46a291c99719309e63b3cb3cf23561eadcommit | diff
Improve conflict resolution between gnulib and textstyle.h.

* libtextstyle/lib/textstyle.h (libtextstyle_isatty): Don't override a Gnulib
override.
libtextstyle/lib/textstyle.h diff | blob | blame | history
Mirror of https://github.com/autotools-mirror/gettext.git