openshot.developers team mailing list archive

[moimael <moimael@xxxxxxx>]

Hmm for the branch format i created a new branch on launchpad, then
download your branch with bazaar, make the changes and commit them to my
new branch. I saw the format is different, i think it's because i use a
newer version of bzr (I'm on archlinux, rolling release) My branche
format is 7 when your is 6.

But i managed to merge branches, like this (from bzr man) :

To merge changes up to and including revision 82 from bzr.dev:

        bzr merge -r 82 ../bzr.dev

You must specify the revision and all is working great.

Yes you are right, ubuntu 8.04 and 8.10 wont work with the new files, but if it's a problem, i can change that, it's quite easy.
But i understood that ubuntu 8.04 and 8.10 have problem with MLT, ... so they aren't supported.

-- 
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