Creating 2.14 release branch.


git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_14/madman/Rpacks/ChemmineR@88839 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge branch 'dev-2.16' into release-2.16

Conflicts:
	DESCRIPTION
updated vignette from development version
code changes to fixe compile errors on mac
Commit made by the Bioconductor Git-SVN bridge.
Consists of 1 commit(s).

Commit information:

    Commit id: f85884372101c62a8197ae9328bbc1f5ad957172
    Commit message:
    code changes to fixe compile errors on mac
    Committed by khoran <khoran at cs.ucr.edu>
    Commit date: 2014-04-30T15:37:21-07:00

From: Bioconductor Git-SVN Bridge <bioc-sync@bioconductor.org>

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_14/madman/Rpacks/ChemmineR@89750 bc3139a8-67e5-0310-9ffc-ced21a209358
backported bug fix for searchSim
Merge branch 'release-master' into release-2.16
Commit made by the Bioconductor Git-SVN bridge.
Consists of 2 commit(s).

Commit information:

    Commit id: 7f35c86fa2cd49641c016aa5ee7ac699a16e2c89
    Commit message:
    backported bug fix for searchSim
    Committed by khoran <khoran at cs.ucr.edu>
    Commit date: 2014-05-05T15:19:07-07:00

    Commit id: b7082122bdf4416a4c3b0271b033ac79284e162b
    Commit message:
    Merge branch 'release-master' into release-2.16
    Committed by khoran <khoran at cs.ucr.edu>
    Commit date: 2014-05-05T15:23:10-07:00

From: Bioconductor Git-SVN Bridge <bioc-sync@bioconductor.org>

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_14/madman/Rpacks/ChemmineR@89940 bc3139a8-67e5-0310-9ffc-ced21a209358
moved some defines around
Merge branch 'release-master' into release-2.16
added darwin chunk to makevars
fix linker bug in mavericks
Merge branch 'release-2.16'

Conflicts:
	DESCRIPTION
	vignettes/ChemmineR.Rmd
	vignettes/html.template
Merge remote-tracking branch 'origin/master'