Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

OTBR
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

f7412cc6

Commit f7412cc6 authored 4 years ago by Tobias Otto

Downloads
- Plain Diff

Merge branch 'Feature_Add_additional_Screen' into 'dev'

Added functions to present stimuli on extra screens

See merge request !5

parents 7216cdb6 475cb7d8

Branches

No related tags found

2 merge requests!7Merge dev branch into master branch,!5Added functions to present stimuli on extra screens

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

Screen/closeExtraWindow.m 88 additions, 0 deletions

Screen/closeExtraWindow.m
Screen/initExtraWindow.m 178 additions, 0 deletions

Screen/initExtraWindow.m
Screen/initWindow.m 29 additions, 23 deletions

Screen/initWindow.m
Screen/showExtraStimuli.m 188 additions, 0 deletions

Screen/showExtraStimuli.m

with 483 additions and 23 deletions

Loading

0% Loading 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