• last updated 7 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merged changes from the oacs-5-9 branch and resolved conflicts

    • -36687
    • +221521
    ./ChangeLog
  1. … 7834 more files in changeset.
Merging back to HEAD branch oacs-5-8 (using tag vg-merge-oacs-5-8-from-20141027).

  1. … 2547 more files in changeset.
Merged 5.5.1 to HEAD

  1. … 181 more files in changeset.
Non-info file merge results, with conflicts resolved.

  1. … 203 more files in changeset.
Merged from 5.4.2

  1. … 283 more files in changeset.
Merged 5.3 to HEAD

  1. … 60 more files in changeset.
Merged the 5.3 branch with HEAD. Look for tags with the pattern

drb-*-20070513

  1. … 324 more files in changeset.
a config parameter read used a hardwired server name; unhardwired it

  1. … 1 more file in changeset.
Merged acs-core oacs-5-2 (currently 5.2.3) -> HEAD.

TODO:

1. Bump acs-core package version numbers to 5.3.0d1

2. Would be nice to do a test install, wouldn't it?

  1. … 721 more files in changeset.
commit to HEAD of merge of changes on oacs-5-1 branch between tags jcd-merge-5-1-20040724 and jcd-merge-5-1-20050111

  1. … 2275 more files in changeset.
merge of changes on oacs-5-1 branch between tags jcd-merge-5-1-20040628 and jcd-merge-5-1-20040712 to HEAD

  1. … 116 more files in changeset.
merge all the changes on the oacs-5-1 and dotlrn-2-0 branches up to tag jcd-merge-20040420

  1. … 647 more files in changeset.
merge of all changes on oacs-5-0 branch between tag openacs-5-0-0-final and jcd-merge-pre503 (except those in lars-blogger).

  1. … 5 more files in changeset.
merge of changes between oacs-5-0-0b4 and oacs-5-0-0-final to HEAD

  1. … 286 more files in changeset.
file ChangeLog was initially added on branch oacs-5-0.