Mercurial > hg > massef
comparison help_html/source/help_MASSEFresults_merge.m @ 38:c7d11a428a0d tip master
Merge branch 'develop'
* develop:
Updated copyright year.
author | Christopher Hummersone <c.hummersone@surrey.ac.uk> |
---|---|
date | Tue, 16 May 2017 12:15:34 +0100 |
parents | 8f36d7072f2f |
children |
comparison
equal
deleted
inserted
replaced
36:01e89332e23e | 38:c7d11a428a0d |
---|---|
9 % MASSEFresults> array |r| into a singular <help_MASSEFresults.html | 9 % MASSEFresults> array |r| into a singular <help_MASSEFresults.html |
10 % MASSEFresults> object |newObj|. | 10 % MASSEFresults> object |newObj|. |
11 % | 11 % |
12 % <html> | 12 % <html> |
13 % <hr> | 13 % <hr> |
14 % <p>Copyright © 2016 <a href="http://www.surrey.ac.uk">University of Surrey</a><br> | 14 % <p>Copyright © 2017 <a href="http://www.surrey.ac.uk">University of Surrey</a><br> |
15 % <a href="http://iosr.uk">Institute of Sound Recording, University of Surrey, UK</a></p> | 15 % <a href="http://iosr.uk">Institute of Sound Recording, University of Surrey, UK</a></p> |
16 % </html> | 16 % </html> |