cleared merge conflicts
parent
f8b71ccc
No related branches found
No related tags found
Showing
- opossum/examples/paraxial_lens_correction.rs 2 additions, 2 deletionsopossum/examples/paraxial_lens_correction.rs
- opossum/examples/ray_propagation.rs 1 addition, 3 deletionsopossum/examples/ray_propagation.rs
- opossum/src/nodes/mod.rs 1 addition, 2 deletionsopossum/src/nodes/mod.rs
- opossum/src/plottable.rs 1 addition, 1 deletionopossum/src/plottable.rs
- opossum/src/properties.rs 2 additions, 4 deletionsopossum/src/properties.rs
- opossum/src/ray.rs 1 addition, 1 deletionopossum/src/ray.rs
- opossum/src/rays.rs 2 additions, 4 deletionsopossum/src/rays.rs
Loading
Please register or sign in to comment