...
- Resolved Conflicts
- gradebook-trunk-workingcopy/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/GradebookDependentBean.java
- gradebook-trunk-workingcopy/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/EnrollmentTableBean.java
...
HELP
| No Format |
|---|
svn export -r 36116 https://source.sakaiproject.org/svn/help/trunk help-trunk /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/help vendor/current-trunk help-trunk svn copy https://mware.ucdavis.edu/svn/ucd-sakai/help/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/help/tags/trunk-R36116 -m 'tagging help vendor drop trunk-R36116' svn co https://mware.ucdavis.edu/svn/ucd-sakai/help/trunk help-trunk-workingcopy svn merge https://mware.ucdavis.edu/svn/ucd-sakai/help/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/help/tags/trunk-R36116 help-trunk-workingcopy svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' help-trunk-workingcopy |
...