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

  1. … 7834 more files in changeset.
- standardize url construction

  1. … 2 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.
1. Merge 2.4.1 to HEAD other than assessment, imsld, lorsm, and views.

2. Bump version numbers to 2.5.0d1.

  1. … 379 more files in changeset.
Merged the 5.4 branch to HEAD, to pick up emmanuelle's fixes before I go

off fixing a bunch of other stuff.

  1. … 27 more files in changeset.
Merged changes to HEAD ...

  1. … 1556 more files in changeset.
file navbar.tcl was initially added on branch oacs-5-3.