Skip to content

Commit

Permalink
Merge branch 'annotations' of https://github.com/OpenModelica/OMEdit …
Browse files Browse the repository at this point in the history 
…into annotations

Conflicts:
	OMEdit/OMEditGUI/Editors/BaseEditor.cpp
  • Loading branch information
@adeas31
adeas31 committed May 19, 2016
2 parents cd9be34 + 9475de6 commit 329215b
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 329215b

Please sign in to comment.