Skip to content
Snippets Groups Projects
Commit ef12441b authored by Alberto Debiasi's avatar Alberto Debiasi
Browse files

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

neon-orig

Conflicts:
	plugins/mobius/org.polarsys.chess.mobius.model.edit/about.html
	plugins/mobius/org.polarsys.chess.mobius.model.editor/about.html
	plugins/mobius/org.polarsys.chess.mobius.model/about.html

Change-Id: I05f2a0a72e85b7f545ee9ce16bc862925283dde1
parents 71cb8239 17196486
No related branches found
No related tags found
No related merge requests found
Showing
with 95 additions and 1182 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment