Hello my friends! As Mirko said, he did have a few hours free and he did commit a lot of branch merges!! thanks a lot Mirko! :)
I also took the time (a few hours) to check every commit made since 0.97 (almost 900 commits, wow!) and tried to see if they should be merged or not... up until revision 9667, Harry and Mirko have done quite a few merges already, but I feel there are some commits that might have been forgotten, so here's the list of revisions that might need merging (anything with a question mark is a revision that I'm not sure whether to merge it or not) : 9193 9228 9231 9246 9254 9267+9268 9269 9282 9313 9320? 9321 9325? 9341 9348 9360 9373+9374 9378 9385? 9387 (only protocol.tcl) 9388 9414+9415 discuss 9520 : relative paths? yes or no? 9590? about 9520, the addition of relative paths instead of absolute paths for DP and custom emoticons, Harry says yes, Mirko says no, so we should discuss this (but Mirko is the patch stable? iirc it had a bug where the relative path became ~/smileys/... instead of smileys/...) ? And here is the list of commits after 9667 that still need merging : 9668 9670 9679 9688 9695 9703+9704 9713 9723 9741 9744 9758 9765 9770 9772 9773+9787+9809 9774 9776 9779+9780 9797 9799 9818 9825 9826 9827 9841 9890 9896 9902 (needs to be merged manually) 9907 9909 9911?+9917?+9935? (do we want to add the 'show offline group' option?) 9929 9930 9931 9934 9952? (needs manual patch from 9803 - add the 'signout' button in the states menu) 9954? 9960? Once this is done, we would need to copy all the translation files over to the 0.97.1 branch, and test the plugin that have been modified (searchcontact, remind..) to make sure they are '0.97 compatible' and copy them too. I would also suggest that we update all the binary extensions (Cximage 6.0, tcl_siren, webcamsn, etc..) since they have important modifications... for example CxImage 6.0 has a HUGE performance gain (like 20 times faster..) That's it.. once we do this, I think we'll be ready to release 0.97.1... we can then 'waste our time' fixing bugs from the bug tracker/bug reporting system, until *I* finish fixing stuff in the SVN with regars to MSNP15 so we can release both the 0.97.1 and the 0.98alpha at the same time.. Thanks again for your work Harry and Mirko, I hope you'll get some more free time to merge all those patches I listed above. KaKaRoTo ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Amsn-devel mailing list Amsn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/amsn-devel
