> Hello Tom,
>
> Looks like some kind of conflict was committed to the codebase for
> src/gui/seqmanager/ChannelManager.h:
> <<<<<<< variant A
> void insertChannelSetup(MappedEventList &mC,
> RosegardenDocument *doc,
> Segment *s, RealTime start);
>>>>>>>> variant B
> void insertChannelSetup(MappedEventList &mC, RealTime start,
> MapperFunctionality *functionality);
> ####### Ancestor
> ======= end
Oh my. When I commit, I first make a clean branch here that visits the
SVN, then merge the new work, deal with conflicts, then push to SVN after
all the conflicts are dealt with. Looks like one slipped thru, and I
apologize deeply.
I will push a clean copy. I'm nearly finished with MidiFile, so that will
be present too.
Tom Breton (Tehom)
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Rosegarden-devel mailing list
[email protected] - use the link below to unsubscribe
https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
