-
# Conflicts: # NEWS # README.md # configure.ac # doc/Doxyfile # doc/source/conf.py # sonar-project.properties
-
# Conflicts: # ChangeLog # NEWS
-
# Conflicts: # ChangeLog # doc/source/admin/release_history/1.6.rst
-
# Conflicts: # ChangeLog
# Conflicts: # NEWS # README.md # configure.ac # doc/Doxyfile # doc/source/conf.py # sonar-project.properties
# Conflicts: # ChangeLog # NEWS
# Conflicts: # ChangeLog # doc/source/admin/release_history/1.6.rst
# Conflicts: # ChangeLog