Allright, let me know when you take a break. This rebasing will work best when you can pull from the fixed branch without reproducing the conflicts ;-)

On 06.07.2013, at 01:22, mainakjas <notifications@github.com> wrote:

> In mne/realtime/epochs.py:
> 
> > +
> > +    Parameters
> > +    ----------
> > +    client : instance of mne.realtime.RtClient
> > +        The realtime client.
> > +    event_id : int | list of int
> > +        The id of the event to consider. If int, only events with the
> > +        ID specified by event_id are considered. Multiple event ID's
> > +        can be specified using a list.
> > +    tmin : float
> > +        Start time before event.
> > +    tmax : float
> > +        End time after event.
> > +    n_epochs : int
> > +        Number of epochs to return before iteration over epochs stops.
> > +    consume_epochs : bool
> ok cool, I'm not pushing anything now. I'll just go back to the original state and continue my work there.
> 
> —
> Reply to this email directly or view it on GitHub.