[Fedora-spins] [spin-kickstarts/f21: 62/62] design: add LuxRender and YaraRay plugin for Blender

[Bruno Wolff III]

On Tue, Oct 14, 2014 at 11:50:30 -0400,
  Rich Mattes <richmattes at gmail.com> wrote:
>On Tue, Oct 14, 2014 at 2:51 AM, Luya Tshimbalanga <luya at fedoraproject.org>
>wrote:
>
>What's going on here, it looks like this is an incomplete merge.  Did you
>mean to merge all 62 of these commits from the master branch into f21, or
>just the last commit?

People should NOT be doing any merges between the public branches, but 
rather use cherry-pick.

That merge should be reverted.