As you all know Galileo has been working
in merging the bugs fixed from oacs-5-1
to the oacs-5-2 branch for
all the packages included in dotlrn-all.
The merge has been finished.
There is a Tag named: vg-merge-dotlrn-2-2-pre-20050922
which is a "snapshot" of the repository before the merge.
And there is one Tag named: vg-merge-dotlrn-2-2-post-20050926, which is a "snapshot" of the repository after the merge.
And finally there is one tag named: vg-merge-dotlrn-2-1-20050922 which was used as reference
to the oacs-5-1 branch.
This is the list of packages that i merged:
acs-datetime,acs-events,attachments,bm-portlet
bulk-mail,calendar,calendar-portlet,categories,
curriculum,curriculum-portlet,dotlrn,dotlrn-admin,
dotlrn-bm,dotlrn-calendar,dotlrn-curriculum,dotlrn-dotlrn,
dotlrn-faq,dotlrn-forums,dotlrn-fs,dotlrn-homework,dotlrn-news,
dotlrn-news-aggregator,dotlrn-portlet,dotlrn-static,
dotlrn-survey,dotlrn-syllabus,dotlrn-weblogger,
faq,faq-portlet,file-storage,forums,forums-portlet,
fs-portlet,general-comments,lars-blogger,new-portal
news,news-aggregator,news-aggregator-portlet,news-portlet
oacs-dav,profile-provider,rss-support,static-portlet
survey,survey-portlet,trackback,user-preferences
user-profile,weblogger-portlet,workflow,xml-rpc
Plese, if you are commiting a bug fix or something *DO NOT*: change the indentations of the code, add/remove spaces/tabs/lines. If you are changing indentation or something, do it with a different commit with a well explained message indicating what are you doing.
This would make easier the process of merge. :).
Regards,
Victor Guerra.
