Skip to content
Snippets Groups Projects
Commit 10df5658 authored by michele's avatar michele
Browse files

Merge remote-tracking branch 'origin/master' into april2013hackfest 

Conflicts:
	DESCRIPTION
	NAMESPACE
	R/createMassBank.R
	R/leMsMs.r
	R/leMsmsRaw.R
	R/parseMassBank.R
	R/validateMassBank.R
	R/webAccess.R
	inst/unitTests/runit.MS2.test.R
	man/parseMassBank.Rd
	man/smiles2mass.Rd
	man/validate.Rd
parents 0a7497bf ece14999
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 556 additions and 276 deletions
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