Creating 2.14 release branch.


git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_14/madman/Rpacks/flowCore@88839 bc3139a8-67e5-0310-9ffc-ced21a209358
conflicts resolved while setting up Git-SVN bridge

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

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/flowCore@89003 bc3139a8-67e5-0310-9ffc-ced21a209358
bump version
conflicts resolved while setting up Git-SVN bridge

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

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/flowCore@89005 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge commit '5f2456f7b3033a2a1d34b7c14b344bae2179ffb6'
1.remove dependeancy on feature package 2.fix ellipse gating error

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_14/madman/Rpacks/flowCore@89012 bc3139a8-67e5-0310-9ffc-ced21a209358
fix bug in polytope gating
Merge branch 'trunk'
merge from trunk
Commit made by the Bioconductor Git-SVN bridge.
Consists of 1 commit(s).

Commit information:

    Commit id: 608c28b4023ad55976d187331a2b05f6b5aba4b5
    Commit message:
    1.remove dependeancy on feature package 2.fix ellipse gating error

    git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_14/madman/Rpacks/flowCore@89012 bc3139a8-67e5-0310-9ffc-ced21a209358
    Committed by m.jiang <m.jiang at bc3139a8-67e5-0310-9ffc-ced21a209358>
    Commit date: 2014-04-15T18:28:36Z

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

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/flowCore@89077 bc3139a8-67e5-0310-9ffc-ced21a209358
Commit made by the Bioconductor Git-SVN bridge.
Consists of 1 commit(s).

Commit information:

    Commit id: 608c28b4023ad55976d187331a2b05f6b5aba4b5
    Commit message:
    1.remove dependeancy on feature package 2.fix ellipse gating error

    git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_14/madman/Rpacks/flowCore@89012 bc3139a8-67e5-0310-9ffc-ced21a209358
    Committed by m.jiang <m.jiang at bc3139a8-67e5-0310-9ffc-ced21a209358>
    Commit date: 2014-04-15T18:28:36Z

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

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/flowCore@89077 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge commit '608c28b4023ad55976d187331a2b05f6b5aba4b5'
merge from bioc-devel

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_14/madman/Rpacks/flowCore@89078 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge branch 'master' of github.com:RGLab/flowCore
Merge branch 'trunk'
conflicts resolved while setting up Git-SVN bridge

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

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/flowCore@89338 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge branch 'trunk'
Merge branch 'master' of github.com:RGLab/flowCore
Commit made by the Bioconductor Git-SVN bridge.
Consists of 1 commit(s).

Commit information:

    Commit id: 4e2448b40f4f1790a3051641826295d0766314a5
    Commit message:
    bump version
    Committed by mikejiang <wjiang2 at fhcrc.org>
    Commit date: 2014-04-22T10:19:28-07:00

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

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/flowCore@89339 bc3139a8-67e5-0310-9ffc-ced21a209358
resolve the svn and git conflicts by manuall remove 3 files