Hello greno, as hda said, we are currently putting efforts into merging new functionalities from trunk and bugfixes from stable.
Unfortunately, we waited too long before this first merge, so that the situation is become wild and we can not solve it simply by doing a bzr merge. That's why we had created a branch of the current stable and we are currently copying new features one by one from the trunk into this branch. This may take some times but we want to be sure that none of the bugfixes done on the stable are lost, and it also allows us to take some time to review the code (through the diff). Once this merge is done, the new branch will replace the actual trunk. This is a very special situation caused by the delay we took before merging stable and trunk, and it's not supposed to occured anymore. For further merges, we will proceed periodically like announced. Thanks -------------------- m2f -------------------- -- http://www.openobject.com/forum/viewtopic.php?p=43688#43688 -------------------- m2f -------------------- _______________________________________________ Tinyerp-users mailing list http://tiny.be/mailman2/listinfo/tinyerp-users
