Merge master into release/4

--HG-- branch : release
vx68k · Jul 12, 2020 · dec1306 · dec1306
2 parents e123b25 + 957318c
commit dec1306
Show file tree

Hide file tree

Showing 20 changed files with 1,213 additions and 408 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,37 +1,39 @@
 TEST-*.xml
 test*.exec
 run-test
-xllmnrd
-xllmnrd.8
-libxllmnrd.a
-libgnu.a
-getopt.h
-arg-nonnull.h
-c++defs.h
-warn-on-use.h
-stddef.h
-stdlib.h
-sysexits.h
-unistd.h
-**/sys/types.h
+**/xllmnrd/xllmnrd
+**/xllmnrd/xllmnrd.8
+**/xllmnrd/xllmnrd.init
+**/libgnu/getopt.h
+**/libgnu/stddef.h
+**/libgnu/stdlib.h
+**/libgnu/sysexits.h
+**/libgnu/unistd.h
+**/libgnu/sys/types.h
+**/libgnu/arg-nonnull.h
+**/libgnu/c++defs.h
+**/libgnu/warn-on-use.h
 remove-potcdate.sed
+POTFILES
 Makefile
-config.status
 config.h
+config.status
 libtool
-POTFILES
 Makefile.in
 config.h.in
 configure
 aclocal.m4
 stamp-*
 .libs
 .deps
+_build
 **/nbproject/private
 *@quot.po
 *@boldquot.po
 *.trs
 *.log
+*.la
+*.a
 *.insert-header
 *.gmo
 *.lo

diff --git a/.hgignore b/.hgignore
@@ -2,37 +2,39 @@ syntax: regexp
 (^|/)TEST-[^/]*\.xml$
 (^|/)test[^/]*\.exec$
 (^|/)run-test$
-(^|/)xllmnrd$
-(^|/)xllmnrd\.8$
-(^|/)libxllmnrd\.a$
-(^|/)libgnu\.a$
-(^|/)getopt\.h$
-(^|/)arg-nonnull\.h$
-(^|/)c\+\+defs\.h$
-(^|/)warn-on-use\.h$
-(^|/)stddef\.h$
-(^|/)stdlib\.h$
-(^|/)sysexits\.h$
-(^|/)unistd\.h$
-(^|/)sys/types\.h$
+(^|/)xllmnrd/xllmnrd$
+(^|/)xllmnrd/xllmnrd\.8$
+(^|/)xllmnrd/xllmnrd\.init$
+(^|/)libgnu/getopt\.h$
+(^|/)libgnu/stddef\.h$
+(^|/)libgnu/stdlib\.h$
+(^|/)libgnu/sysexits\.h$
+(^|/)libgnu/unistd\.h$
+(^|/)libgnu/sys/types\.h$
+(^|/)libgnu/arg-nonnull\.h$
+(^|/)libgnu/c\+\+defs\.h$
+(^|/)libgnu/warn-on-use\.h$
 (^|/)remove-potcdate\.sed$
+(^|/)POTFILES$
 (^|/)Makefile$
-(^|/)config\.status$
 (^|/)config\.h$
+(^|/)config\.status$
 (^|/)libtool$
-(^|/)POTFILES$
 (^|/)Makefile\.in$
 (^|/)config\.h\.in$
 (^|/)configure$
 (^|/)aclocal\.m4$
 (^|/)stamp-[^/]*$
 (^|/)\.libs$
 (^|/)\.deps$
+(^|/)_build$
 (^|/)nbproject/private$
 @quot\.po$
 @boldquot\.po$
 \.trs$
 \.log$
+\.la$
+\.a$
 \.insert-header$
 \.gmo$
 \.lo$

diff --git a/.hgtags b/.hgtags
@@ -12,3 +12,4 @@ c3349e7c9aa5a2f62949984f0ea68d32eeedfb9e release/2.1
 8cbada9b725b155e85c3854e3e2de17c9983d8aa release/3.0
 a2284063ce4576724707b8054ca5e4c7968b1246 release/4-alpha.1
 a4a11ec00505b69c35a418b63e847e17ea43fd18 release/3.1
+349aacd81547f6ed36f4ab1502ddcab2419d5d95 release/4-alpha.2