Skip to content
Snippets Groups Projects
Commit 39068180 authored by Pospelov, Gennady's avatar Pospelov, Gennady
Browse files

Merge branch 'DoxyXML' into develop 

Conflicts:
	Core/PythonAPI/src/Beam.pypp.cpp
	Core/PythonAPI/src/OffSpecSimulation.pypp.cpp
	Core/PythonAPI/src/Simulation.pypp.cpp
parents 0e67b190 48400ff3
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 126 additions and 83 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment