Code

Issue361 axivitydemofile#367

Code

Merged

vincentvanhees merged 6 commits intomasterwadpac/GGIR:masterfrom issue361_axivitydemofilewadpac/GGIR:issue361_axivitydemofileCopy head branch name to clipboardOct 20, 2020

+13-10

Commits

Commits on Sep 30, 2020

• possible fix #361

  vincentvanhees

  committed
  5101ed6

  Copy full SHA for 5101ed6

Commits on Oct 15, 2020

• Merge branch 'master' into issue361_axivitydemofile

  vincentvanhees

  committed
  36d96b6

  Copy full SHA for 36d96b6

• updating change log with fix for #361

  vincentvanhees

  committed
  d8a3e34

  Copy full SHA for d8a3e34

• replacing object name frequency by samfreq because frequency is also a function in R, and could cause ambiguities #361

  vincentvanhees

  committed
  7c8e0ea

  Copy full SHA for 7c8e0ea

• fixing bug in previous commit

  vincentvanhees

  committed
  1f651a1

  Copy full SHA for 1f651a1

Commits on Oct 20, 2020

• fix merge conflict

  vincentvanhees

  committed
  2104a85

  Copy full SHA for 2104a85