On Monday, January 30, 2012, Julie S wrote: > Looks like some kind of conflict was committed to the codebase for > src/gui/seqmanager/ChannelManager.h: <<<<<<< variant A
I see the same here. Not even trying to work past that. I did commit a fix for the data.cpp problem. Apparently we never automated the process of picking up changes to the example files, so if you add or remove anything, you have to run scripts/rebuild-qrc manually to get everything back in sync. -- D. Michael McIntyre ------------------------------------------------------------------------------ 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
