Merge branch 'master' of http://gitlab.doc.gold.ac.uk/wfish001/CP_Ocbox (ac16982f) · Commits · William Fish / CP_Ocbox · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

CP_Ocbox
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Container Registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

William Fish
CP_Ocbox
Commits
ac16982f

Commit ac16982f authored 6 years ago by

James Carty

Downloads
- Plain Diff

Merge branch 'master' of http://gitlab.doc.gold.ac.uk/wfish001/CP_Ocbox

parents 5c524a6a 4a60f049

Branches

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

VisualProgress/visual_consolidation/src/beatDetection.cpp 5 additions, 4 deletions

VisualProgress/visual_consolidation/src/beatDetection.cpp
VisualProgress/visual_consolidation/src/beatDetection.h 1 addition, 1 deletion

VisualProgress/visual_consolidation/src/beatDetection.h
VisualProgress/visual_consolidation/src/main.cpp 2 additions, 0 deletions

VisualProgress/visual_consolidation/src/main.cpp
VisualProgress/visual_consolidation/src/ofApp.cpp 48 additions, 2 deletions

VisualProgress/visual_consolidation/src/ofApp.cpp
VisualProgress/visual_consolidation/src/ofApp.h 22 additions, 3 deletions

VisualProgress/visual_consolidation/src/ofApp.h
VisualProgress/visual_consolidation/src/techno.cpp 164 additions, 51 deletions

VisualProgress/visual_consolidation/src/techno.cpp
VisualProgress/visual_consolidation/src/techno.h 3 additions, 3 deletions

VisualProgress/visual_consolidation/src/techno.h
readme.txt 11 additions, 1 deletion

readme.txt

with 256 additions and 65 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment