Skip to content
GitLab
Commit 20a0071b authored by Domingo Manubens's avatar Domingo Manubens
Browse files

Merge branch 'master' into develop-ACC_permutation 

Conflicts:
	DESCRIPTION
	NAMESPACE
	R/ACC.R
	R/Load.R
	R/PlotEquiMap.R
	man/ACC.Rd
	man/Load.Rd
	man/PlotACC.Rd
	man/PlotStereoMap.Rd
parents 88d00f79 7554c89f
Expand all Hide whitespace changes
Inline Side-by-side
Supports Markdown
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