Commit 474a5b03 authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 2.1.21+git20190531.feceb81

parent e20e24f0

example/splitsinfile/splitsstructs.cpp

+1 −0
Original line number Diff line number Diff line 
#include "splitsstructs.h"

#include <algorithm>

bool TreesToSplits::gTrackTrivial = false;

bool TreesToSplits::gTreatAsRooted = false;

bool TreesToSplits::gTrackFreq = false;

ncl/nxstaxablock.h

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ class NxsTaxaBlock 
			taxLabels = other.taxLabels;

			labelToIndex = other.labelToIndex;

			dimNTax = other.dimNTax;

			taxSets = taxSets;

			taxSets = other.taxSets;

			taxPartitions = other.taxPartitions;

			inactiveTaxa = other.inactiveTaxa;

			}