Merge remote-tracking branch 'remotes/origin/wingj'
Conflicts:
functions/manualAverageInterface.m
Description
Description
Details
Details
- Committed
oburri Apr 20 2016, 09:33 - Pushed
oburri Oct 13 2016, 13:34 - Parents
- R1417:0458aadd97a5: Bug corrections
R1417:7caf99922e6d: adds SD - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 0458aadd97a5 | oburri | Bug corrections | Apr 19 2016 | |||
| 2f12c07d0ea7 | oburri | Merge branch 'master' into wingj | Apr 14 2016 | |||
| 83c302346078 | oburri | Merge branch 'master' into wingj | Apr 13 2016 | |||
| 9a996b845a01 | oburri | Loads WingJ Things | Apr 13 2016 | |||
| 56e481553521 | oburri | Merge branch 'Branch_29595a7fe1681495b89b242efa89198d4428cfce' into wingj | Apr 13 2016 | |||
| 046752149d02 | oburri | some change | Apr 13 2016 |