_Bits with anxiety disorder

About RSS
Aug 5, 2011 | #GSoC #KDE #planet-fosswomen #planetkde-camila #Umbrello #gsoc #kde #linkedin #umbrello

[GSoC] Umbrello: Merging soc branch and trunk.

Hi!

After my last talk with my mentor, we decided that would be better to merge what I've doing until now in the trunk instead of to wait until the end of the project - that would be so much more work (even now, have been hard to get the new merged branch compiling and working). So for this, I made a branch from the trunk wich I am merging with the soc-umbrello-2011 branch.

The merge result (untill now) you can check here: http://websvn.kde.org/branches/work/umbrello-qgv-port/.

The idea is: if any change will beĀ  done in the trunk, need to be done in the new branch as well.

Bye. Cya at Desktop Summit =)