tree 21f4cc041022d90343dc8a89df487131c02edada
parent 0e58296dbd32175b81a2d639c7d1df9f233a836a
parent 4990f2b918f7151de2d92ce806ea257c81feaff4
author Alberto Debiasi <adebiasi@fbk.eu> 1588238912 +0200
committer Alberto Debiasi <adebiasi@fbk.eu> 1588238912 +0200

Merge remote-tracking branch 'origin/master' into neon

Conflicts:
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.classpath
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/META-INF/MANIFEST.MF
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/plugin.xml_gen
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/FlaDslUiModule.java
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/contentassist/FlaDslProposalProvider.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl/.classpath
	plugins/fla/org.polarsys.chess.xtext.fladsl/META-INF/MANIFEST.MF
	plugins/fla/org.polarsys.chess.xtext.fladsl/plugin.xml_gen
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/FlaDslRuntimeModule.java
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/FlaDslStandaloneSetup.java
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/validation/FlaDslValidator.xtend

Change-Id: I53087b42678e799d1486c9ffc95f7d067c904987