SALOME platform Git repositories - modules/shaper.git/commit

]> SALOME platform Git repositories - modules/shaper.git/commit

projects / modules / shaper.git / commit

author	mpv <mikhail.ponikarov@opencascade.com>
	Wed, 23 Apr 2014 04:17:13 +0000 (08:17 +0400)
committer	mpv <mikhail.ponikarov@opencascade.com>
	Wed, 23 Apr 2014 04:17:13 +0000 (08:17 +0400)
commit	29b4b1b5e692ebc45e8a27703b9307b075d2cff2
tree	d730d01cc61afedf291ab3446ab7647cd157025d	tree \| snapshot
parent	7b1cee901954dabb2e9165caf72baff2393db266	commit \| diff

Merge branch 'master' of newgeom:newgeom

Conflicts:
CMakeLists.txt
src/Config/CMakeLists.txt
src/Config/plugins.xml

31 files changed:

CMakeLists.txt		diff \| blob \| history
src/Config/plugins.xml		diff \| blob \| history
src/ModelAPI/ModelAPI_Document.h		diff \| blob \| history
src/ModuleBase/ModuleBase_Operation.cpp		diff \| blob \| history
src/ModuleBase/ModuleBase_Operation.h		diff \| blob \| history
src/PartSet/CMakeLists.txt		diff \| blob \| history
src/PartSet/PartSet_Module.cpp		diff \| blob \| history
src/PartSet/PartSet_Module.h		diff \| blob \| history
src/PartSet/PartSet_OperationSketch.cpp	[new file with mode: 0644]	blob
src/PartSet/PartSet_OperationSketch.h	[new file with mode: 0644]	blob
src/PartSet/PartSet_OperationSketchBase.cpp	[new file with mode: 0644]	blob
src/PartSet/PartSet_OperationSketchBase.h	[new file with mode: 0644]	blob
src/PartSet/PartSet_icons.qrc		diff \| blob \| history
src/PartSet/icons/line.png	[new file with mode: 0644]	blob
src/PartSet/icons/sketch.png	[new file with mode: 0644]	blob
src/SketchPlugin/CMakeLists.txt	[new file with mode: 0644]	blob
src/SketchPlugin/SketchPlugin.h	[new file with mode: 0644]	blob
src/SketchPlugin/SketchPlugin_Feature.cpp	[new file with mode: 0644]	blob
src/SketchPlugin/SketchPlugin_Feature.h	[new file with mode: 0644]	blob
src/SketchPlugin/SketchPlugin_Plugin.cpp	[new file with mode: 0644]	blob
src/SketchPlugin/SketchPlugin_Plugin.h	[new file with mode: 0644]	blob
src/SketchPlugin/SketchPlugin_Sketch.cpp	[new file with mode: 0644]	blob
src/SketchPlugin/SketchPlugin_Sketch.h	[new file with mode: 0644]	blob
src/SketchPlugin/plugin-Sketch.xml	[new file with mode: 0644]	blob
src/XGUI/CMakeLists.txt		diff \| blob \| history
src/XGUI/XGUI_Displayer.cpp	[new file with mode: 0644]	blob
src/XGUI/XGUI_Displayer.h	[new file with mode: 0644]	blob
src/XGUI/XGUI_Viewer.cpp		diff \| blob \| history
src/XGUI/XGUI_Viewer.h		diff \| blob \| history
src/XGUI/XGUI_Workshop.cpp		diff \| blob \| history
src/XGUI/XGUI_Workshop.h		diff \| blob \| history

SALOME Shaper module

RSS Atom