Merge branch 'develop' into hybrid
Conflicts: eigen/eigen.F90 eigen/tlmplm.F90 global/types.F90 init/gen_bz.F90 io/r_inpXML.F90 main/fleur.F90
Showing
Please register or sign in to comment
Conflicts: eigen/eigen.F90 eigen/tlmplm.F90 global/types.F90 init/gen_bz.F90 io/r_inpXML.F90 main/fleur.F90