Think it would be a good idea to sync the branches at this point...? I mean, merge 1.0 -> 1.1 -> master.
I'm getting a bit worried about potential merge conflicts, especially since 1.1 and master now both have changes in the same file, a few even in the same function... also I'd like to do some testing with the master branch to see how the recent 1.1 changes work together with the 1.2 features. (I know, I could do this in my own fork, but things would be easier and simpler if it's in upstream... I try to cut down branch proliferation on my end...) ------------------------------------------------------------------------------ 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
