openshot.developers team mailing list archive

[Jonathan Thomas <Jonathan.Oomph@xxxxxxxxx>]

moimael,
I have run into some trouble trying to merge your branch into the trunk.  Apparently, you did not branch the trunk originally (at least that is my guess), and thus the 2 branches are now un-related.  Also, the 'Repository Format' is different, which is killing the merge process.  

I will continue to research the problem.

-- 
Replace Glade with GtkBuilder
https://bugs.launchpad.net/bugs/510510
You received this bug notification because you are a member of OpenShot
Developers, which is subscribed to OpenShot Video Editor.

Status in OpenShot Video Editor: New

Bug description:
moimael has proposed merging lp:~moimael/openshot/gtkbuilder into lp:openshot.

   Requested reviews:
   OpenShot Developers (openshot.developers)


I finally manage to convert openshot to gtkbuilder, libglade is no more required at all :D
All is working for me, but i can not test everything, so this branch need some review to track potential regressions.The attached diff has been truncated due to its size.
--
https://code.launchpad.net/~moimael/openshot/gtkbuilder/+merge/15130