commit 87113245d328270b93d7e1b573bb72eb0dc0555f
author Alberto Debiasi <adebiasi@fbk.eu> Wed May 13 18:14:50 2020 +0200
committer Alberto Debiasi <adebiasi@fbk.eu> Wed May 13 18:14:50 2020 +0200
tree 98854d1c7d80d577fbefe2a0e269bd9eb1dd0e18
parent 7d0594d332f1a43d4962a78993f82f430f33917b
parent 24d1487390f24d84930b72e7ad7eef9a37ab750d

Merge branch 'neon' of https://git.eclipse.org/r/chess/chess.git into
neon

Conflicts:
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslDescriptionLabelProvider.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslLabelProvider.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/outline/FlaDslOutlineTreeProvider.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/quickfix/FlaDslQuickfixProvider.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/formatting/FlaDslFormatter.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/generator/FlaDslGenerator.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/validation/FlaDslValidator.xtend

Change-Id: I5315768ba10a0377a053fa5244c92cb75ed528bb