source: trunk/MERGE

Name	Size	Rev	Age	Author	Last Change
../
Makefile	19.5 KB ​	19339	2 years	westram	* reintegrates 'refactor' into 'trunk' - eliminates old interface …
merge.hxx	3.4 KB ​	17262	6 years	westram	* partial merge from 'group' into 'trunk' - fixes to arb_progress …
MG_adapt_ali.cxx	37.6 KB ​	19339	2 years	westram	* reintegrates 'refactor' into 'trunk' - eliminates old interface …
MG_adapt_ali.hxx	1.7 KB ​	18092	5 years	westram	* full update from child 'fts' into 'trunk' - implements #562 * …
MG_alignment.cxx	4.7 KB ​	19206	2 years	westram	* reintegrates 'ali' into 'trunk' * adds: log:branches/ali@19183:19205
MG_checkfield.cxx	13.1 KB ​	19339	2 years	westram	* reintegrates 'refactor' into 'trunk' - eliminates old interface …
MG_configs.cxx	6.9 KB ​	18964	3 years	westram	* remove parameter fallback2default from - …
MG_extendeds.cxx	8.2 KB ​	18964	3 years	westram	* remove parameter fallback2default from - …
MG_gene_species.cxx	23.4 KB ​	18979	3 years	westram	* fix use of empty labels: - AW_window::label no longer …
MG_main.cxx	14.2 KB ​	18730	3 years	westram	* remove trailing whitespace from c source.
mg_merge.hxx	798 bytes ​	9817	12 years	westram	* merging DBs from intro-window was no longer possible if arb_ntree …
MG_names.cxx	7.7 KB ​	16763	7 years	westram	* partial merge from 'gcc' into 'trunk' - use nullptr in …
MG_preserves.cxx	15.5 KB ​	19365	18 months	westram	* string splitters: - unittests for GBT_split_string: …
MG_species.cxx	53.9 KB ​	19349	2 years	westram	* fix mnemonics: - in 'Tree' menu: * p: was used for 'Print …
MG_trees.cxx	10.2 KB ​	18964	3 years	westram	* remove parameter fallback2default from - …
needs_libs	156 bytes ​	18088	5 years	westram	* reintegrates 'fts' into 'trunk' * adds: - …

Property svn:ignore set to MERGE.a *.gcno *.bak