On 06/22/2014 08:30 PM, Vesa wrote: > On 06/22/2014 12:39 AM, Tobias Doerffel wrote: >> Hi, >> >> just merged stable branches so everything should be up-to-date now >> again. Thinks also still seem to build fine even though I didn't test >> for functionality. > Ok, I see that the logscale patches aren't merged in master, so how do > we handle this? Since those commits are pretty much a guaranteed merge > conflict... Should I port the changes to master manually with another > commit, or...?
Ok, never mind, I took the liberty of dealing with the merge conflict, I merged the logscale updates to master - I thought since I wrote the original commit, it was easiest for me to deal with the merge conflict, which was actually just two lines, so it wasn't as bad as I feared. Everything should be peachy now... ------------------------------------------------------------------------------ HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions Find What Matters Most in Your Big Data with HPCC Systems Open Source. Fast. Scalable. Simple. Ideal for Dirty Data. Leverages Graph Analysis for Fast Processing & Easy Data Exploration http://p.sf.net/sfu/hpccsystems _______________________________________________ LMMS-devel mailing list LMMS-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/lmms-devel
