GitLab

Conflicts:
	projects/Makefile.am
	src/backends/ocarina-backends-aadl_xml-main.adb
	src/backends/ocarina-backends-ada_tree-debug.adb
	src/backends/ocarina-backends-ada_tree-debug.ads
	src/backends/ocarina-backends-ada_tree-generator-spark.adb
	src/backends/ocarina-backends-ada_values.adb
	src/backends/ocarina-backends-asn1_tree-debug.adb
	src/backends/ocarina-backends-asn1_tree-debug.ads
	src/backends/ocarina-backends-asn1_tree-generator.adb
	src/backends/ocarina-backends-asn1_values.adb
	src/backends/ocarina-backends-c_tree-debug.ads
	src/backends/ocarina-backends-c_values.adb
	src/backends/ocarina-backends-cheddar-mapping.adb
	src/backends/ocarina-backends-mast_tree-debug.adb
	src/backends/ocarina-backends-mast_tree-debug.ads
	src/backends/ocarina-backends-mast_values.adb
	src/backends/ocarina-backends-pn-components.adb
	src/backends/ocarina-backends-pn-components.ads
	src/backends/ocarina-backends-pn-debug.adb
	src/backends/ocarina-backends-pn-debug.ads
	src/backends/ocarina-backen...