Copied v1.12 files over from eeglab plugin download

[cboulay]

and modified to suit new structure.

It seems as though git diff thinks much has changed between the files but obviously this is not true. Maybe eol mismatch? Should I handle it or just leave it?

[dmedine]

Isn't there some eol magic via git? I always forget what it is. But, as
far as I know 1.12 is pretty close to 1.11. I think it's okay to leave
it for now. I will take a look at it to make sure it is ok. I'm pretty
sure it's fine, though.

Thanks!

On 2/29/2016 12:24 PM, Chadwick Boulay wrote:

and modified to suit new structure.

It seems as though git diff thinks much has changed between the files
but obviously this is not true. Maybe eol mismatch? Should I handle it
or just leave it?

---

    You can view, comment on, or merge this pull request online at:

#4

    Commit Summary

• Copied files over from eeglab plugin download and modified to suit
  new structure.

  File Changes
  

• M Matlab/eeg_load_xdf.m
  https://github.com/sccn/xdf/pull/4/files#diff-0 (624)

• M Matlab/eegplugin_xdfimport.m
  https://github.com/sccn/xdf/pull/4/files#diff-1 (138)

• M Matlab/pop_loadxdf.m
  https://github.com/sccn/xdf/pull/4/files#diff-2 (246)

• M Matlab/xdf/load_xdf.m
  https://github.com/sccn/xdf/pull/4/files#diff-3 (1629)

• M Matlab/xdf/load_xdf_innerloop.c
  https://github.com/sccn/xdf/pull/4/files#diff-4 (392)

  Patch Links:
  

• https://github.com/sccn/xdf/pull/4.patch

• https://github.com/sccn/xdf/pull/4.diff

—
Reply to this email directly or view it on GitHub
#4.

[dmedine]

I'll check it out an pull it this afternoon.

[dmedine]

Did not have time this afternoon. Tomorrow.

[chkothe]

We could also merge the changes in by hand using a merge tool that can
ignore line endings and/or whitespace as a workaround, and then commit that.

On Mon, Feb 29, 2016 at 4:44 PM, David Medine notifications@github.com
wrote:

Did not have time this afternoon. Tomorrow.

—
Reply to this email directly or view it on GitHub
#4 (comment).

[cboulay]

I sorted out the line endings on my end and refreshed the pull request.

With some other repositories that I've worked on, it was considered better to force push a pull request than to delete it, delete the branch, make a new branch, and make a new pull request. I hope you don't mind that's what I did here. If you've already checked out this branch then you'll have to force pull.

[chkothe]

Ok, great! Yes, I don't have an issue with folks force-pushing to rewrite
their PRs (unless others have actively contributed to it already, which
almost never happens).

On Mon, Feb 29, 2016 at 5:41 PM, Chadwick Boulay notifications@github.com
wrote:

I sorted out the line endings on my end and refreshed the pull request.

With some other repositories that I've worked on, it was considered better
to force push a pull request than to delete it, delete the branch, make a
new branch, and make a new pull request. I hope you don't mind that's what
I did here. If you've already checked out this branch then you'll have to
force pull.

—
Reply to this email directly or view it on GitHub
#4 (comment).

[chkothe]

This change here was applied to 1.11 in a 3rd party contribution without bumping up the version number, and was unfortunately not reflected in the 1.12 version. It's probably best to carry this line over into 1.12 in the repo.

[cboulay]

OK. If that's all then please go ahead and merge then attempt to make_release.py
tags and releases are easily deleted so there's no real problem there.

And if you forget to add the mex files to the Matlab/xdf folder before creating the release, they can always be added to the release manually via the web interface.