Simon,
For some reason, it got moderated by launchpad. I'm not sure why.
Maybe it was the size of the attachment. I'll see if I can apply this
patch without conflicts. @Mario, please send me a commit message to go
along with this patch. I would rather not have to dig through your
branch to
Hi,
On 18.07.2016 21:18, Simon Richter wrote:
> If we don't care about the branch history, I've attached a diff between
> the current product branch tip and Mario's branch (fixing one conflict
> in a comment and reverting the bitmaps).
It seems the list dropped the attachment.
Link:
Hi,
On 18.07.2016 19:54, Wayne Stambaugh wrote:
> I could not merge your branch into the product branch. Here is the
> merge error message:
Rebasing that branch is going to be difficult because of all the
backmerges from mainline.
If we don't care about the branch history, I've attached a
Mario,
I could not merge your branch into the product branch. Here is the
merge error message:
Conflict: can't delete 3d-viewer/3d_rendering/3d_render_ogl_legacy.moved
because it is not empty. Not deleting.
Conflict adding file 3d-viewer/3d_rendering/3d_render_ogl_legacy. Moved
existing file
I've actually stopped building it because I couldn't find any more real issues
and it was becoming a hassle to manage the separate branch... yeah, definitely
time to merge.
On Fri, Jul 15, 2016 at 01:35:07PM -0400, Wayne Stambaugh wrote:
> One last call for known issues and/or objections before I
5 matches
Mail list logo
