fixed DESCRIPTION conflict

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MSnbase@81827 bc3139a8-67e5-0310-9ffc-ced21a209358
removed duplicated pRolocdata suggests

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MSnbase@81828 bc3139a8-67e5-0310-9ffc-ced21a209358
fixed DESCRIPTION conflict

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MSnbase@81829 bc3139a8-67e5-0310-9ffc-ced21a209358
removed duplicated pRolocdata suggests

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MSnbase@81830 bc3139a8-67e5-0310-9ffc-ced21a209358
document effect of na.rm

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MSnbase@81831 bc3139a8-67e5-0310-9ffc-ced21a209358
fixed NEWS conflict

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MSnbase@81832 bc3139a8-67e5-0310-9ffc-ced21a209358
merge conflicts

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MSnbase@81878 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge branch 'master' into local-hedgehog

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MSnbase@83315 bc3139a8-67e5-0310-9ffc-ced21a209358
CHANGES IN VERSION 1.11.4
-------------------------
 o passing ... to sweep when normalising [2013-12-08 Sun]
 o updated makeMTD to accomodate new MS ontology [2013-12-23 Mon]

Merge branch 'master' into local-hedgehog

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MSnbase@84992 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge branch 'master' into local-hedgehog

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MSnbase@86640 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge branch 'master' into local-hedgehog

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MSnbase@86885 bc3139a8-67e5-0310-9ffc-ced21a209358
modify to new biocViews to DESCRIPTION file



git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MSnbase@87035 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge pull request #18 from vladpetyuk/master

adding redundancy handling to combineFeatures
update desc and news
fixed some errors from previous PR and updated doc
updated testing to testthat 0.8
fixed conflict

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MSnbase@87474 bc3139a8-67e5-0310-9ffc-ced21a209358
new dev version
package needs version number


git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MSnbase@87495 bc3139a8-67e5-0310-9ffc-ced21a209358
combineFeatures fixes, tests and doc