Laurent Rineau a5fcf016b7 Merge branch '5.6.x-branch' ...

# Conflicts:
#	Documentation/doc/resources/1.8.13/BaseDoxyfile.in
#	Documentation/doc/resources/1.9.6/BaseDoxyfile.in

2023-10-16 11:11:07 +02:00

..

1.8.13

Merge branch '5.6.x-branch'

2023-10-16 11:11:07 +02:00

1.9.6

Merge branch '5.6.x-branch'

2023-10-16 11:11:07 +02:00