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-backends-pn-format-cami.adb
	src/backends/ocarina-backends-pn-format-tina.adb
	src/backends/ocarina-backends-pn-iutils.adb
	src/backends/ocarina-backends-pn-iutils.ads
	src/backends/ocarina-backends-pn-nutils.adb
	src/backends/ocarina-backends-pn-nutils.ads
	src/backends/ocarina-backends-po_hi_rtsj-runtime.adb
	src/backends/ocarina-backends-po_hi_rtsj.adb
	src/backends/ocarina-backends-pok_c.adb
	src/backends/ocarina-backends-rtsj_tree-debug.adb
	src/backends/ocarina-backends-rtsj_tree-debug.ads
	src/backends/ocarina-backends-rtsj_tree-generator.adb
	src/backends/ocarina-backends-rtsj_values.adb
	src/backends/ocarina-backends-xml_tree-debug.adb
	src/backends/ocarina-backends-xml_tree-debug.ads
	src/backends/ocarina-backends-xml_values.adb
	src/backends/ocarina-be_aadl.ads
	src/backends/ocarina-be_aadl_ba.ads
	src/backends/ocarina-be_real.adb
	src/core/common_files/locations.adb
	src/core/common_files/locations.ads
	src/core/common_files/utils.adb
	src/core/common_files/utils.ads
	src/core/instance/ocarina-instances-real_checker-queries-access_predicates.ads
	src/core/instance/ocarina-instances-real_checker-queries-bound_predicates.ads
	src/core/instance/ocarina-instances-real_checker-queries-call_predicates.ads
	src/core/instance/ocarina-instances-real_checker-queries-connected_predicates.ads
	src/core/instance/ocarina-instances-real_checker-queries-passing_predicates.ads
	src/core/instance/ocarina-instances-real_checker-queries-predecessor_predicates.ads
	src/core/instance/ocarina-instances-real_checker-queries-provided_class_predicates.ads
	src/core/instance/ocarina-instances-real_checker-queries-relational_predicates.ads
	src/core/instance/ocarina-instances-real_checker-queries-subcomponent_predicates.ads
	src/core/instance/ocarina-instances-real_checker-queries.adb
	src/core/instance/ocarina-instances-real_checker-queries.ads
	src/core/instance/ocarina-instances.ads
	src/core/mgmt/ocarina-files.ads
	src/core/mgmt/ocarina-parser.adb
	src/core/model/ocarina-analyzer-aadl-links.adb
	src/core/model/ocarina-analyzer-messages.adb
	src/core/model/ocarina-builder-aadl-annexes.adb
	src/core/model/ocarina-builder-aadl-annexes.ads
	src/core/model/ocarina-builder-aadl-components-modes.adb
	src/core/model/ocarina-builder-aadl-components-modes.ads
	src/core/model/ocarina-builder-aadl-namespaces.adb
	src/core/model/ocarina-builder-aadl-namespaces.ads
	src/core/tree/ocarina-aadl_values.ads
	src/core/tree/ocarina-annotations.adb
	src/core/tree/ocarina-me_aadl-aadl_instances-debug.adb
	src/core/tree/ocarina-me_aadl-aadl_instances-debug.ads
	src/core/tree/ocarina-me_aadl-aadl_instances-entities-properties.ads
	src/core/tree/ocarina-me_aadl-aadl_instances-entities.adb
	src/core/tree/ocarina-me_aadl-aadl_instances-entities.ads
	src/core/tree/ocarina-me_aadl-aadl_instances-nutils.ads
	src/core/tree/ocarina-me_aadl-aadl_tree-debug.adb
	src/core/tree/ocarina-me_aadl-aadl_tree-debug.ads
	src/core/tree/ocarina-me_aadl-aadl_tree-entities.adb
	src/core/tree/ocarina-me_aadl-aadl_tree-entities.ads
	src/core/tree/ocarina-me_aadl-aadl_tree-nutils.adb
	src/core/tree/ocarina-me_aadl-aadl_tree-nutils.ads
	src/core/tree/ocarina-me_aadl-printers.adb
	src/core/tree/ocarina-me_aadl-tokens.ads
	src/core/tree/ocarina-me_aadl_ba-ba_tree-debug.ads
	src/core/tree/ocarina-me_aadl_ba-ba_tree-nutils.ads
	src/core/tree/ocarina-me_aadl_ba-tokens.ads
	src/core/tree/ocarina-me_real-real_tree-debug.adb
	src/core/tree/ocarina-me_real-real_tree-debug.ads
	src/core/tree/ocarina-me_real-real_tree-utils.adb
	src/frontends/aadl/ocarina-fe_aadl-lexer.ads
	src/frontends/aadl/ocarina-fe_aadl-parser-annexes.adb
	src/frontends/aadl/ocarina-fe_aadl-parser-annexes.ads
	src/frontends/aadl/ocarina-fe_aadl-parser-components-arrays.adb
	src/frontends/aadl/ocarina-fe_aadl-parser-components-arrays.ads
	src/frontends/aadl/ocarina-fe_aadl-parser-components-connections.adb
	src/frontends/aadl/ocarina-fe_aadl-parser-components-connections.ads
	src/frontends/aadl/ocarina-fe_aadl-parser-components-features.adb
	src/frontends/aadl/ocarina-fe_aadl-parser-components-features.ads
	src/frontends/aadl/ocarina-fe_aadl-parser-components-modes.adb
	src/frontends/aadl/ocarina-fe_aadl-parser-components-modes.ads
	src/frontends/aadl/ocarina-fe_aadl-parser-components-prototypes.adb
	src/frontends/aadl/ocarina-fe_aadl-parser-components-prototypes.ads
	src/frontends/aadl/ocarina-fe_aadl-parser-components-subcomponents.adb
	src/frontends/aadl/ocarina-fe_aadl-parser-components-subcomponents.ads
	src/frontends/aadl/ocarina-fe_aadl-parser-components-subprogram_calls.adb
	src/frontends/aadl/ocarina-fe_aadl-parser-components-subprogram_calls.ads
	src/frontends/aadl/ocarina-fe_aadl-parser-components.adb
	src/frontends/aadl/ocarina-fe_aadl-parser-components.ads
	src/frontends/aadl/ocarina-fe_aadl-parser-namespaces.adb
	src/frontends/aadl/ocarina-fe_aadl-parser-namespaces.ads
	src/frontends/aadl/ocarina-fe_aadl-parser-properties.adb
	src/frontends/aadl/ocarina-fe_aadl-parser-properties.ads
	src/frontends/aadl/ocarina-fe_aadl-parser.adb
	src/frontends/aadl/ocarina-fe_aadl-parser.ads
	src/frontends/aadl/ocarina-fe_aadl-parser_errors.ads
	src/frontends/aadl_ba/ocarina-fe_aadl_ba-lexer.ads
	src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser-actions.adb
	src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser-expressions.adb
	src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser-identifiers.adb
	src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser-identifiers.ads
	src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser-specifications.adb
	src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser-specifications.ads
	src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser-thread_dispatch.adb
	src/frontends/real/ocarina-fe_real-lexer.adb
	src/main/ocarina_cmd.adb
	src/transfo/ocarina-transfo.ads
	tools/mknodes/namet.adb
	tools/mknodes/namet.ads
	tools/mknodes/types.ads