* OMEdit 4bf74df...d4d7d13 (1): · OpenModelica/OpenModelica@fd62832

Commit

* OMEdit 4bf74df...d4d7d13 (1):

  > Merge branch 'adeas31-3dviewer'

adeas31 authored and OpenModelica-Hudson committed Jan 27, 2017

1 parent d76b3df commit fd62832

+63 −1		OMEdit/OMEditGUI/Animation/AbstractAnimationWindow.cpp
+1 −0		OMEdit/OMEditGUI/Animation/AbstractAnimationWindow.h
+0 −51		OMEdit/OMEditGUI/Animation/AnimationWindow.cpp
+17 −4		OMEdit/OMEditGUI/Component/Component.cpp
+1 −0		OMEdit/OMEditGUI/Component/ComponentProperties.cpp
+45 −25		OMEdit/OMEditGUI/Editors/MetaModelEditor.cpp
+4 −3		OMEdit/OMEditGUI/Editors/MetaModelEditor.h
+1 −0		OMEdit/OMEditGUI/MainWindow.cpp
+4 −0		OMEdit/OMEditGUI/MainWindow.h
+3 −2		OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
+318 −100		OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
+7 −1		OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.h
+4 −1		OMEdit/OMEditGUI/TLM/TLMCoSimulationDialog.cpp
+2 −0		OMEdit/OMEditGUI/Util/Helper.cpp
+1 −0		OMEdit/OMEditGUI/Util/Helper.h
+27 −19		OMEdit/OMEditGUI/Util/StringHandler.cpp