Skip to content

Comments

ST6RI-37 Update to 2018-12 baseline abstract syntax#8

Merged
seidewitz merged 7 commits intomasterfrom
ST6RI-36
Jan 8, 2019
Merged

ST6RI-37 Update to 2018-12 baseline abstract syntax#8
seidewitz merged 7 commits intomasterfrom
ST6RI-36

Conversation

@seidewitz
Copy link
Member

No description provided.

@seidewitz seidewitz self-assigned this Jan 8, 2019
Resolved Conflicts:
	org.omg.sysml.ide/src-gen/org/omg/sysml/ide/contentassist/antlr/internal/InternalAlf.tokens
	org.omg.sysml.ide/src-gen/org/omg/sysml/ide/contentassist/antlr/internal/InternalAlfLexer.java
	org.omg.sysml.ide/src-gen/org/omg/sysml/ide/contentassist/antlr/internal/InternalAlfParser.java
	org.omg.sysml/src-gen/org/omg/sysml/Alf.xtextbin
	org.omg.sysml/src-gen/org/omg/sysml/parser/antlr/internal/InternalAlf.tokens
	org.omg.sysml/src-gen/org/omg/sysml/parser/antlr/internal/InternalAlfLexer.java
	org.omg.sysml/src-gen/org/omg/sysml/parser/antlr/internal/InternalAlfParser.java
	org.omg.sysml/src-gen/org/omg/sysml/serializer/AlfSemanticSequencer.java
@seidewitz seidewitz merged commit 4722d4d into master Jan 8, 2019
@seidewitz seidewitz deleted the ST6RI-36 branch November 9, 2020 22:44
seidewitz added a commit that referenced this pull request Nov 22, 2023
ST6RI-723 Resolution SYSML2-467 from SysML v2 FTF Ballot #8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant