-
- Downloads
Merge branch 'depthabundance' into develop
Conflicts: GUI/coregui/Views/PropertyEditor/AwesomePropertyPresenter.cpp
Showing
- App/src/TestPolarizedDWBATerms.cpp 9 additions, 14 deletionsApp/src/TestPolarizedDWBATerms.cpp
- Core/Algorithms/inc/LayerStrategyBuilder.h 1 addition, 1 deletionCore/Algorithms/inc/LayerStrategyBuilder.h
- Core/Algorithms/src/LayerStrategyBuilder.cpp 8 additions, 17 deletionsCore/Algorithms/src/LayerStrategyBuilder.cpp
- Core/FormFactors/inc/FormFactorDecoratorRotation.h 12 additions, 12 deletionsCore/FormFactors/inc/FormFactorDecoratorRotation.h
- Core/FormFactors/inc/FormFactors.h 1 addition, 1 deletionCore/FormFactors/inc/FormFactors.h
- Core/FormFactors/src/FormFactorCrystal.cpp 1 addition, 1 deletionCore/FormFactors/src/FormFactorCrystal.cpp
- Core/FormFactors/src/FormFactorDecoratorRotation.cpp 5 additions, 5 deletionsCore/FormFactors/src/FormFactorDecoratorRotation.cpp
- Core/PythonAPI/inc/ParticleInfo.pypp.h 0 additions, 23 deletionsCore/PythonAPI/inc/ParticleInfo.pypp.h
- Core/PythonAPI/inc/PythonCoreList.h 0 additions, 1 deletionCore/PythonAPI/inc/PythonCoreList.h
- Core/PythonAPI/src/Crystal.pypp.cpp 12 additions, 12 deletionsCore/PythonAPI/src/Crystal.pypp.cpp
- Core/PythonAPI/src/IClusteredParticles.pypp.cpp 12 additions, 12 deletionsCore/PythonAPI/src/IClusteredParticles.pypp.cpp
- Core/PythonAPI/src/ILayout.pypp.cpp 7 additions, 7 deletionsCore/PythonAPI/src/ILayout.pypp.cpp
- Core/PythonAPI/src/IParticle.pypp.cpp 43 additions, 10 deletionsCore/PythonAPI/src/IParticle.pypp.cpp
- Core/PythonAPI/src/ParticleInfo.pypp.cpp 0 additions, 538 deletionsCore/PythonAPI/src/ParticleInfo.pypp.cpp
- Core/PythonAPI/src/ParticleLayout.pypp.cpp 12 additions, 23 deletionsCore/PythonAPI/src/ParticleLayout.pypp.cpp
- Core/PythonAPI/src/PythonInterface_free_functions.pypp.cpp 12 additions, 0 deletionsCore/PythonAPI/src/PythonInterface_free_functions.pypp.cpp
- Core/PythonAPI/src/PythonModule.cpp 0 additions, 2 deletionsCore/PythonAPI/src/PythonModule.cpp
- Core/Samples/inc/Crystal.h 2 additions, 2 deletionsCore/Samples/inc/Crystal.h
- Core/Samples/inc/IClusteredParticles.h 1 addition, 2 deletionsCore/Samples/inc/IClusteredParticles.h
- Core/Samples/inc/ILayout.h 1 addition, 2 deletionsCore/Samples/inc/ILayout.h
Loading
Please register or sign in to comment