Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
TGuillerme committed Aug 21, 2017
2 parents 50a06db + 6722973 commit b4623bd
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
1 change: 0 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Imports:
ade4,
geometry,
grDevices,
hypervolume,
paleotree,
phangorn,
phyclust,
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ See the package manual online [here](https://rawgit.com/TGuillerme/dispRity/mast
Additionally, you can learn more about the structure of `dispRity` objects [here](https://github.com/TGuillerme/dispRity/blob/master/disparity_object.md).

##### Patch notes
* 2017/08/15 - v0.4.0 *users are friends*
* 2017/08/21 - v0.4.0 *user friendly*
* Entirely rewritten manual (in GitBook)!
* **Removed** `hyper.volume` metric for dependencies reasons
* **Removed** `parallel` option from `boot.matrix` (the new architecture is already super fast: >2sec for 5k taxa and 10k bootstraps!)
* *New* function: `Claddis.ordination` and `geomorph.ordination` for automatically ordinating data from `Claddis` and `geomorph` packages!
* *New* function: `char.diff` for calculating character differences and associated plot function (`plot.char.diff`)
Expand Down
2 changes: 1 addition & 1 deletion patch_notes.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Patch notes
----
* 2017/08/21 - v0.4.0 *users are friends*
* 2017/08/21 - v0.4.0 *user friendly*
* Entirely rewritten manual (in GitBook)!
* **Removed** `hyper.volume` metric for dependencies reasons
* **Removed** `parallel` option from `boot.matrix` (the new architecture is already super fast: >2sec for 5k taxa and 10k bootstraps!)
Expand Down

0 comments on commit b4623bd

Please sign in to comment.