Commit cea4c794 authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge tag 'astyle-v2.3' into v2.2-stretch

# Conflicts:
#	regtest/crystallization/rt-q6-subset/deriv3.reference
parents 86102101 2813d759
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment