Commit c5adeae7 authored by Jérémie Dudouet's avatar Jérémie Dudouet
Browse files

Merge branch 'Cubix' into 'Cubix'

# Conflicts:
#   src/root/gui/cubix/src/CXArrow.cpp
#   src/root/gui/cubix/src/CXArrow.h
#   src/root/gui/cubix/src/CXFit.cpp
parents a6e5a8cb 1dea6485
Pipeline #65311 passed with stage
in 5 minutes and 9 seconds
Markdown is supported
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