RSS
-
olat3/
- ${mrtgbackup.dir}/
- .externalToolBuilders/
-
.settings/
- CVS/
- org.eclipse.core.resources.prefs
- org.eclipse.jdt.core.prefs
- org.eclipse.jdt.ui.prefs
- org.eclipse.jst.jsp.core.prefs
- org.eclipse.ltk.core.refactoring.prefs
- org.eclipse.wst.common.component
- org.eclipse.wst.common.project.facet.core.xml
- org.eclipse.wst.html.core.prefs
- org.eclipse.wst.jsdt.ui.superType.container
- org.eclipse.wst.jsdt.ui.superType.name
- org.eclipse.wst.validation.prefs
- org.eclipse.wst.xsl.core.prefs
- org.hibernate.eclipse.console.prefs
- templates.xml
- WEB-INF/
- addlib/
-
bin/
- wiki_migration/
- .cvsignore
- MacOSXOlatSetupGenerator.pl
- SVNcheckin_translations.sh
- SVNnightly.sh
- checkForUnusedProperties.sh
- checkin_translations.sh
- chkchelp
- count-unique-users.sh
- countErrorsAndSendSMS.sh
- dbAndUserSetup.sh
- deploy.sh
- diskspace.sh
- jmeter.sh
- logintoolat.sh
- nightly.sh
- nightly_core.sh
- nightly_i18n.sh
- notify_de_diffs.sh
- olat_backup.sh
- olat_backup10.sh
- olat_backup20.sh
- olat_backup_message.sh
- olat_post_backup.sh
- olat_pre_backup.sh
- olat_start.sh.in
- olat_stop.sh.in
- postrotate.sh
- prepare_mysql.sh
- readme.txt
- usefullinuxscripts.txt
- wiki_migration_51.sh
- cluster/
-
conf/
- certs/
- .cvsignore
- apachelogrotate
- apachelogrotate.in
- axis2.xml
- catalina.bat.in
- catalina.policy.in
- catalina.sh.in
- context.xml
- context.xml.in
- hibernate.unittest.properties.in
- httpd.conf
- httpd.conf.in
- httpd_vhost.conf.in
- httpd_vhost_mod_jk.conf.in
- httpd_vhost_workers.properties.in
- instant_messaging_database.sql
- instant_messaging_database.sql.in
- jive-messenger.xml
- jive-messenger.xml.in
- log4j.properties
- log4j.xml
- mod_jk-1.3.26.dll
- openfire.xml
- openfire.xml.in
- server.jk.xml
- server.xml
- server.xml.in
- server_http_connector.xml.in
- server_jk_connector.xml.in
- server_vhost.xml.in
- treecache.xml
- wildfire.xml
- wildfire.xml.in
- workers.properties
- workers2.properties
-
database/
- #cvs.lock/
- mysql/
- oracle/
- postgresql/
- alter_3_0_0_to_3_0_1.sql
- alter_3_0_1_to_3_1_0.sql
- alter_3_1_0_to_3_1_1.sql
- alter_3_1_1_to_3_1_2.sql
- alter_3_1_2_to_3_1_3.sql
- alter_3_1_3_to_3_1_4.sql
- alter_3_1_4_to_3_2_0.sql
- alter_3_2_1_to_3_3.sql
- alter_3_2_1_to_4_0_0.sql
- alter_4_0_0_to_4_1_0.sql
- alter_4_0_2_to_4_0_2_bps.sql
- alter_4_1_4_to_5_0_0.sql
- alter_to_innoDB.sql
- deletePostgreSQL.sql
- drop_structure.sql
- my_lnx.cnf
- my_win.cnf
- o_database.sql
- prepare_db.sql
- readme.txt
- setupPostgreSQL.sql
- dist/
- doc/
- eclipse/
- htdocs/
- interfaces/
- local/
- monitoring/
- null/
- olat/
- patches/
- src/
- test/
- webapp/
- .checkstyle
- .classpath
- .cvsignore
- .project
- .springBeans
- CHANGES.README
- COPYING
- Copyof.classpath
- INSTALL.README
- INSTALL.README.HEAD
- INSTALL_ECLIPSE.README
- LICENSE.TXT
- NOTICE.TXT
- build.info.txt
- build.properties
- build.properties.default
- build.properties.my
- build.xml
- build_cobertura.properties
- build_cobertura.xml
- buildvhost.properties
- buildvhost.xml
- findbugs_exclude_filter.xml
- javadoc.xml
- junit-4.3.1.jar
- junit-red-green-converter.xsl
- layout.properties
- mvn.sh
- olat.dev.properties.sample
- olat.local.properties
- olat.local.properties.sample
- olat.properties
- old-build.properties
- pom.properties
- pom.xml
- server.xml
- server.xml.in
- switchtomcat.xml
- test.file
- treecache.xml
- olat3_i18n/
- olatcore/
- olatcore_i18n/
| Diff | Revision | Date | Message | Lines | Author | Branch |
|---|---|---|---|---|---|---|
| 1.1 | 17 May 04 |
Fresh, clean checkin |
+3 | mike | MAIN | |
| 1.1.120.1 | 12 Jan 09 |
merge Head to branch, part1 |
+1 | rhaag | OLAT-HEAD_FRENTIX-3674 |
Fresh, clean checkin
| Author: | mike |
|---|---|
| Revision: | 1.1 |
| Changeset: | MAIN:mike:20040517151152 |
| Date: | 17:12 17 May 2004 (7 years and 11 months) |
| Branch point for: | OLAT-1847 OLAT-2278 OLAT-2278-2 OLAT-3-1-x-BRANCH OLAT-3-2-x-BRANCH OLAT-4-0-x-BRANCH OLAT-4_0_2-BPS OLAT-4_0_2-BPS-1309 OLAT-4_0_2-BPS_UNIZH-1319 OLAT-4_0_2-ZAG OLAT-4_1-GOODSOLUTIONS-1411 OLAT-4_1_1-GOODSOLUTIONS-1482 OLAT-4_1_2-BRANCH OLAT-4_2_0-BPS-1252 OLAT-4_2_0-BPS-1553 OLAT-4_2_0-BPS-1557 OLAT-4_2_0-BPS-1589 OLAT-4_2_0-UNIZH-1233 OLAT-4_2_0-UNIZH-1480 OLAT-4_2_0-UNIZH-1530 OLAT-4_2_0-UNIZH-1562 OLAT-4_2_0-UNIZH-890 OLAT-4_2_0-UNIZH-903 OLAT-4_2_0-UNIZH-903_2 OLAT-4_2_0-goodsolutions-1232 OLAT-5_0_x-BRANCH OLAT-5_0_y-BRANCH OLAT-5_0_y-UNIZH-1973 OLAT-5_1_0-BPS-1879 OLAT-5_1_0-BPS-1914 OLAT-5_1_x-BRANCH OLAT-5_2_x-BRANCH OLAT-5_2_x-BRANCH-2729 OLAT-6_0_1-MAINTENANCE OLAT-6_0_x-BRANCH OLAT-6_1_x-BRANCH OLAT-6_2-BPS-4072 OLAT-6_2-BPS-FEATURES OLAT-6_2-BPS-FEATURES-JUNE-2009 OLAT-6_2_0-BRANCH-UZH OLAT-6_2_x-BRANCH-PUBLIC OLAT-6_2_x-UZH-essassprj OLAT-6_3_0-PUBLIC OLAT-6_3_x-PATCHES OLAT-6_4_0-BPS-Incubation OLAT-7_0_x-PUBLIC OLAT-7_1-Backbutton OLAT-7_1_x-BRANCH OLAT-HEAD-2438 OLAT-HEAD-BPS-1229 OLAT-HEAD-BPS-1595 OLAT-HEAD-BPS-Prototype_CF OLAT-HEAD-FRENTIX-1979 OLAT-HEAD-FRENTIX-3766-CPEDITOR OLAT-HEAD-FRENTIX-3946-Podcast OLAT-HEAD-FRENTIX-4057-RESTAPI OLAT-HEAD-FRENTIX-4261-Scorm-Result OLAT-HEAD-FRENTIX-5494-EPORTFOLIO OLAT-HEAD-JGS-1577 OLAT-HEAD-JGS-1677 OLAT-HEAD-JGS-1686 OLAT-HEAD-JGS_UNIZH-1509_5 OLAT-HEAD-JGS_UNIZH-1509_pbwork OLAT-HEAD-JLS-1947 OLAT-HEAD-JLS-1947_2 OLAT-HEAD-JLS-1947_3 OLAT-HEAD-JLS-1973 OLAT-HEAD-UNIZH-1508 OLAT-HEAD-UZH-2385 OLAT-HEAD-UZH-2438 OLAT-HEAD-UZH-2771 OLAT-HEAD-UZH-3892 OLAT-HEAD-UZH-4057_REST_API OLAT-HEAD-UZH-4272 OLAT-HEAD-UZH-4353 OLAT-HEAD-UZH-4353-2 OLAT-HEAD-UZH-4361 OLAT-HEAD-UZH-OLAT_2433 OLAT-HEAD-YAML-1725 OLAT-HEAD_FRENTIX-3674 OLAT-HEAD_UNIZH-1320 OLAT-HEAD_UNIZH-1935 OLAT_5_1_-UZH-1983 OLAT_6_4_0-BPS-Onyx_Integration OLAT_FRENTIX_5907_BACKUP_RESTORE olat_4_1_1-goodsolutions-1497 olat_4_1_2-goodsolutions-1509 tmpOLAT-HEAD-640-until-2010-03-10 |
| Tags: | OLAT-3_0_0-FINAL-20040713 OLAT-3_0_1-FINAL-20040804 OLAT-3_1_0-FINAL-20040921 OLAT-3_1_4-FINAL-20041117 OLAT-3-1-x-BRANCH$BP OLAT-3_1_1-FINAL-20041012 OLAT-3_1_3-FINAL-20041020 OLAT-3_1_2-FINAL-20041013 OLAT-3_2_0-PUBLIC-20050415 Root_OLAT-3-2-x-BRANCH OLAT-3-2-x-BRANCH$BP OLAT-3_2_0-FINAL-20050322 OLAT-3_2_0-GoldenMaster-20050304 OLAT-3_2_0-GoldenMaster2-20050318 OLAT-3_2_1-FINAL-20050530 OLAT-4_0_0-GoldenMaster-20050919 OLAT-4_0_0-PUBLIC-20050927 OLAT-4_0_2-PUBLIC-20051108 OLAT-4_0_2-FINAL-20051107 OLAT-MERGE-2-4_0_2-BPS-1309 OLAT-4-0-x-BRANCH$BP OLAT-4_0_2-BPS_UNIZH-1319$BP OLAT-MERGE-1-4_0_2-BPS-1309 OLAT-4_0_1-FINAL-20051017 OLAT-STOP-1288-BPS OLAT-4_0_2-ZAG$BP OLAT-MERGE-3-4_0_2-BPS-1309 OLAT-1253-html-editor-finished OLAT-4_0_2-BPS$BP OLAT-MERGE-3-4_0_2-BPS-1288 OLAT-4_0_2-BPS-1309$BP OLAT-START-1288-BPS OLAT-MERGE-5-4_0_2-BPS-1288 OLAT-MERGE-4-4_0_2-BPS-1288 OLAT-MERGE-2-4_0_2-BPS-1288 Root_OLAT-HEAD_UNIZH-1320 OLAT-HEAD_UNIZH-1320$BP OLAT-4_1_1-PUBLIC-20060323 OLAT-4_1_1-FINAL-20060320 OLAT-4_1_3-FINAL-20060515 OLAT-4_2_0-UNIZH-1480$BP olat_4_1_1-goodsolutions-1497$BP OLAT-4_1_1-GOODSOLUTIONS-1482$BP OLAT-4_1-GOODSOLUTIONS-1411$BP OLAT-4_1_0-FINAL-20060306 OLAT-4_1_2-FINAL-20060406 Root_olat_4_1_1-goodsolutions-1497 OLAT-4_1_0-GoldenMaster-20060303 OLAT-4_1_2-PUBLIC-20060412 Root_OLAT-4_1_1-GOODSOLUTIONS-1482 OLAT-4_1_2-BRANCH$BP OLAT-4_1_4-FINAL-20060619 OLAT-4_2_0-UNIZH-1233$BP olat_4_1_2-goodsolutions-1509$BP OLAT-4_2_0-UNIZH-903_2$BP Root_OLAT-4_2_0-UNIZH-903_2 Root_olat_4_1_2-goodsolutions-1509 OLAT-HEAD-JGS_UNIZH-1509_3 OLAT-HEAD-JGS_UNIZH-1509_2 OLAT-HEAD-JGS_UNIZH-1509_1 Root_OLAT-4_2_0-UNIZH-903 merge_tag_cg_24-04-06 OLAT-HEAD-START-BRANCH-UNIZH-1233 OLAT-4_2_0-UNIZH-903$BP OLAT-HEAD-JGS_UNIZH-1509_4 OLAT-4_2_0-goodsolutions-1232$BP MERGE_OLAT-JGS_UNIZH-1509_pbwork Root_OLAT-4_2_0-BPS-1557 OLAT-HEAD-JGS_UNIZH-1509_5$BP Root_OLAT-4_2_0-UNIZH-890 Root_OLAT-4_2_0-BPS-1252 Root_OLAT-HEAD-JGS_UNIZH-1509_pbwork OLAT-4_2_0-BPS-1553$BP OLAT-4_2_0-BPS-1553_1 OLAT-4_2_0-BPS-1553_2 OLAT-4_2_0-BPS-1557$BP OLAT-HEAD-START-BRANCH-UNIZH-1562 OLAT-4_2_0-UNIZH-890$BP Root_OLAT-4_2_0-goodsolutions-1232 Before-commit-of-OLAT-869 OLAT-HEAD-START-BRANCH-UNIZH-1530 OLAT-HEAD-JGS_UNIZH-1509_pbwork$BP OLAT-4_2_0-UNIZH-1562$BP Root_OLAT-4_2_0-BPS-1553 Root_OLAT-HEAD-JGS_UNIZH-1509_9 Root_OLAT-HEAD-JGS_UNIZH-1509_8 Root_OLAT-HEAD-JGS_UNIZH-1509_7 Root_OLAT-HEAD-JGS_UNIZH-1509_6 Root_OLAT-HEAD-JGS_UNIZH-1509_5 OLAT-4_2_0-UNIZH-1530$BP OLAT-4_2_0-BPS-1252$BP OLAT-HEAD-MERGE-BRANCH-UNIZH-1233 merge_tag_1232 OLAT-HEAD-JGS-1577$BP OLAT-HEAD-MERGE-BRANCH-UNIZH-1562 CB_as OLAT-4_2_0-BPS-1589$BP OLAT-HEAD-BPS-1595$BP Root_OLAT-4_2_0-BPS-1589 OLAT-HEAD-UNIZH-1508$BP Root_OLAT-HEAD-BPS-1595 beforeMerge-BPS-1595 mergeHeadTo1508 Root_OLAT-HEAD-UNIZH-1508 OLAT-5_0_1-FINAL-20061017 OLAT-5_0_2-GC-20061120 Root_OLAT-HEAD-JGS-1677 Root_OLAT-5_0_y-BRANCH OLAT-5_0_1-PUBLIC-20061019 mergeHeadTo1595 OLAT-5_0_1-GM01-20061013 OLAT-5_0_0-GM02-20060925 OLAT-5_0_0-FINAL-20060926 OLAT-5_0_2-FINAL-20061108 OLAT-5_1_0-BPS-1879$BP OLAT-5_0_y-BRANCH$BP OLAT-1847$BP Root_OLAT-5_0_x-BRANCH OLAT-5_0_3-FINAL-20061218 OLAT-5_0_x-BRANCH$BP OLAT-HEAD-JGS-1677$BP OLAT-HEAD-JGS-1686$BP OLAT-5_0_1-GM02-20061013 OLAT-5_0_0-GM-20060922 Root_OLAT-1847 Root_OLAT-HEAD-JGS-1686 merged_OLAT-5_0_x-BRANCH tmpBPS1595 mergeOLAT-5_0_xTo1595 MOVING-OLAT-5_0_y-BRANCH Root_OLAT-HEAD_UNIZH-1935 OLAT-HEAD-BPS-Prototype_CF-WorkCarsten Root_OLAT_5_1_-UZH-1983 OLAT-HEAD-JLS-1973$BP mergeHeadTo1577 Root_OLAT-5_1_0-BPS-1879 OLAT-HEAD-BPS-Prototype_CF$BP Root_OLAT-5_1_0-BPS-1914 OLAT-HEAD-JLS-1947$BP OLAT_5_1_-UZH-1983$BP OLAT-HEAD-JLS-1947_2$BP OLAT-HEAD-JLS-1947_3$BP MS01_291106233000 mergeHeadTo1879_1 Root_OLAT-HEAD-JLS-1947_2 Root_OLAT-HEAD-JLS-1973 Root_OLAT-HEAD-JLS-1947_3 TMP_OLAT-1935 OLAT-HEAD-FRENTIX-1979$BP Root_OLAT-HEAD-JLS-1947 OLAT-5_1_0-BPS-1914$BP TMP-OLAT-5_0_y-BRANCH mergeHEADto1914 Root_OLAT-HEAD-JGS-1577 OLAT-HEAD_UNIZH-1935$BP Root_OLAT-HEAD-FRENTIX-1979 OLAT-5-0-y-wiki MS02_211206181500 OLAT-5_0_y-UNIZH-1973$BP mergeHeadTo1879 mergeHeadTo1983 tmpMergeToHead1983_1 OLAT-5_1_2-PUBLIC-20070403 tmpMergeToHead1879pb OLAT-5_1_0-FINAL-20070228 tmp0FlexiFormOLAT-5_1_x-BRANCH OLAT-5_1_3-PUBLIC-20070507 OLAT-5_1_3-FINAL-20070423 OLAT-5_1_0-GM-20070227 temp-0-Guido OLAT-5_1_x-BRANCH$BP OLAT-5_1_1-FINAL-20070313 tmpMergeToHead1983_2 Root_OLAT-5_1_x-BRANCH tmpPbBrasato Ready_to_seperate Before_Core_Lms_sep OLAT-2278$BP After_Hibernate323_Migration Root_OLAT-2278 Root_OLAT-2278-2 OLAT-2278-2$BP After-commit-of-OLAT-2320-bc-refactoring Before-commit-of-OLAT-2320-bc-refactoring MS01_150507114000 MS01_050607170000 MS01_300507084500 MS01_130607122000 OLAT-HEAD-2438$BP OLAT-HEAD-UZH-2385$BP Root_OLAT-HEAD-UZH-2385 OLAT-5_2_0-MS02-20070626 Root_OLAT-HEAD-2438 OLAT-5_2_0-MS02-20070702 OLAT-5_2_0-MS02-20070703 OLAT-5_2_0-MS02-20070709 OLAT-5_2_0-MS02-20070713 Temp_lavinia_1 Root_OLAT-HEAD-UZH-OLAT_2433 OLAT-HEAD-UZH-OLAT_2433$BP before-merge-5_2_1-to-2433 Temp_lavinia_2 TMP-OLAT-5_2_0-RC03-04-LocalStrings TMP_PB_521_TO_HEAD Root_OLAT-HEAD-BPS-Prototype_CF OLAT-5_2_0-MS02-20070726 Root_OLAT-5_2_x-BRANCH TMP-OLAT-5_2_0-RC04-LocalStrings TMP-OLAT-5_2_0-RC02-LocalStrings OLAT-5_2_x-BRANCH$BP TMP-OLAT-5_2_0-RC01-LocalStrings OLAT-5_2_1-FINAL-20070911 OLAT-5_2_0-GoldenMaster-20070822 OLAT-5_2_1-GoldenMaster-20070911 Merged-5_2_2-20070927-Into-HEAD OLAT-5_2_2-PUBLIC-20070913 OLAT-5_2_3-FINAL-20071119 OLAT-5_2_3-PUBLIC-20071120 OLAT-5_2_4-FINAL-20080310 OLAT-5_2_1-PUBLIC-20070912 OLAT-5_2_4-RC01-20080228 Root_OLAT-5_2_x-BRANCH-2729 OLAT-5_2_0-FINAL-20070822 OLAT-5_2_x-BRANCH-2729$BP OLAT-5_2_4-RC02-20080306 Merged-5_2_1-RC01-Into-HEAD TMP-OLAT-5_2_0-TO-HEAD TMP-OLAT-5_2_0-TO-HEAD-2 Merged-2433-Branch-Into-HEAD_5_2_1 Before-moving-i18n-and-content-to-core-20071127 Root_OLAT-HEAD-UZH-2771 before-merge-cg-5_2_3_to_HEAD OLAT-HEAD-UZH-2771$BP before-merge-2725-YAML-to-HEAD OLAT-HEAD-YAML-1725$BP mergeHeadTo2725 after-merge-cg-5_2_3_to_HEAD Root_OLAT-HEAD-YAML-1725 Before_merge_5_2_x_into_Head_20070924 after-merge-gs-5_2_3_to_HEAD before-merge-2434-CF-to-HEAD mergeHeadToOLAT-HEAD-BPS-Prototype_CF after-merge-2725-YAML-to-HEAD before-commit-OLAT-3601-separation-i18n-project OLAT-6_0_x-BRANCH$BP Root_OLAT-6_0_x-BRANCH OLAT-6_0_0-PUBLIC-20080604 OLAT-6_0_1-RC01-20080619 OLAT-6_0_1-RC03-20080627 OLAT-6_0_1-RC02-20080623 OLAT-6_0_3-PUBLIC-20080820 OLAT-6_0_3-RC01-20080731 OLAT-6_0_2-MAINTENANCE-20080723 OLAT-6_0_4-RC04-20080908 OLAT-6_0_6-PUBLIC-20081120 before_merge_HEAD_emergency_into_6_0_x_BRANCH OLAT-6_0_1-RC05-20080708 OLAT-6_0_5-RC02-20080925 OLAT-6_0_1-RC04-20080703 OLAT-6_0_4-FINAL-20080909 OLAT-6_0_1-FINAL-20080714 OLAT-6_0_1-GM-20080711 OLAT-6_0_4-RC01-20080924 OLAT-6_0_6-FINAL-20081117 OLAT-6_0_3-MERGE_TO_HEAD OLAT-6_0_3_CR02-20080805 OLAT-6_0_5-FINAL-20081010 OLAT-6_0_5-FINAL-20081008 OLAT-6_0_4-RC03-20080908 OLAT-6_0_1-RC06-20080710 OLAT-6_0_1-MAINTENANCE$BP OLAT-6_0_5-RC01-20080924 OLAT-6_0_3-FINAL-20080812 OLAT-6_0_3-FINAL-20080819 OLAT-6_0_5-RC03-20081003 OLAT-6_0_5-RC04-20081006 OLAT-6_0_4-RC02-20080904 OLAT-6_0_4-RC01-20080902 OLAT-6_0_7-FINAL-20081201 OLAT-6_0_7-RC01-20081126 OLAT-6_0_7-PUBLIC-20081203 mmw_i18n_2008_07_22 i18n_merged_2008_07_22 OLAT-HEAD-BPS-1229$BP Root_OLAT-HEAD-BPS-1229 OLAT-HEAD_FRENTIX-3674$BP OLAT-6_1_0-RC01-20090108 OLAT-6_1_0-RC04-20090115 OLAT-6_1_0-RC02-20090112 OLAT-6_1_0-RC03-20090115 OLAT-HEAD-FRENTIX-3946-Podcast$BP OLAT-6_1_0-RC06-20090119 OLAT-6_1_0-RC05-20090119 mergePodcast3946ToHead OLAT-6_1_0-RC07-20090120 OLAT-6_1_0-RC26-20090211 OLAT-6_1_0-RC13-20090128 OLAT-HEAD-FRENTIX-3766-CPEDITOR$BP OLAT-6_1_0-RC19-20090129 OLAT-6_1_0-RC10-20090122 OLAT-6_1_0-RC15-20090129 OLAT-6_1_0-RC25-20090210 OLAT-6_1_0-RC16-20090129 OLAT-6_1_0-RC23-20090130 OLAT-6_1_0-RC11-20090123 OLAT-6_1_0-RC08-20090121 OLAT-6_1_0-RC14-20090128 OLAT-6_1_0-RC17-20090129 OLAT-6_1_0-RC09-20090122 OLAT-6_1_0-RC12-20090123 OLAT-6_1_0-RC24-20090209 OLAT-6_2-BPS-FEATURES$BP Root_OLAT-HEAD-UZH-3892 OLAT-6_1_0-RC27-20090223 OLAT-6_1_1-RC04-20090428 OLAT-6_1_1-RC06-20090430 OLAT-6_1_0-PUBLIC-20090312 OLAT-6_1_0-RC28-20090224 Root_OLAT-6_2-BPS-FEATURES OLAT-6_1_1-PUBLIC-20090513 OLAT-6_1_1-RC01-20090406 Root_OLAT-6_1_x-BRANCH OLAT-6_1_1-RC02-20090409 OLAT-6_1_x-BRANCH$BP OLAT-6_1_1-RC05-20090429 OLAT-6_1_1-RC03-20090416 OLAT-HEAD-UZH-3892$BP Root_OLAT-6_2_x-UZH-assessprj OLAT-HEAD-UZH-2438$BP Root_OLAT-6_2_x-UZH-matthai Root_OLAT-HEAD_FRENTIX-3674 Root_OLAT-HEAD-UZH-4057_REST_API OLAT-6_2-BPS-4072$BP OLAT-HEAD-FRENTIX-4261-Scorm-Result$BP OLAT-6_2_x-UZH-essassprj$BP Root_OLAT-HEAD-FRENTIX-4261-Scorm-Result Root_OLAT-6_2-BPS-4072 Root_OLAT-6_2_x-UZH-essassprj Root_OLAT-6_2_X-UZH-matthai Root_OLAT-HEAD-FRENTIX-3766-CPEDITOR Root_OLAT-6_2-BPS-FEATURES-JUNE-2009 OLAT-6_2_0-MS01-20090622 mergeHeadTo3674 mergeHeadTo3766-CPEDITOR OLAT-6_2-BPS-FEATURES-JUNE-2009$BP Root_OLAT-HEAD-UZH-2438 OLAT-HEAD-UZH-4057_REST_API$BP Root_OLAT-HEAD-FRENTIX-3946-Podcast OLAT-6_2_0-BPS-ESAMO-24072009 Root_OLAT-HEAD-FRENTIX-4261_SCORMResults OLAT-6_2_0-RC01-20090804 OLAT-6_2_0-RC05-20090811 OLAT-6_2_0-RC12-20090907 OLAT-6_2_0-RC03-20090806 Root_OLAT-6_2_0-BRANCH-UZH OLAT-6_2_x-BRANCH-PUBLIC$BP Root_OLAT-6_2_x-BRANCH-PUBLIC Root_OLAT-HEAD-FRENTIX-4261-SCORes Root_OLAT-HEAD-UZH-4272 Root_OLAT-HEAD-UZH-4353 OLAT-HEAD-UZH-4353$BP OLAT-HEAD-UZH-4361$BP OLAT-6_2_0-RC06-20090813 OLAT-HEAD-UZH-4272$BP OLAT-6_2_0-RC13-20090915 Root_OLAT-HEAD-FRENTIX-4261-SCORMResults OLAT-6_2_0-RC11-20090904 OLAT-6_2_0-BRANCH-UZH$BP OLAT-6_2_0-RC04-20090810 OLAT-6_2_1-20091009 Root_OLAT-HEAD_UZH-4274 OLAT_6_2_0-RC09-20090831 OLAT-6_2_0-RC08-20090827 OLAT-6_2_0-BPS OLAT-6_2_0-RC07-20090826 OLAT-6_2_0-RC10-20090902 OLAT-6_2_0-RC02-20090805 mergeHeadTo3946-PODCAST last_nightly last_stable OLAT-6_2_2-RC01-20091028 OLAT-HEAD-UZH-4353-2$BP Root_OLAT-HEAD-UZH-4353-2 last_stable_20091101 OLAT-6_2_2-PUBLIC-20091110 OLAT_TF_20091202 Root_tmpOLAT-HEAD-640-until-2010-03-10 tmpOLAT-HEAD-640-until-2010-03-10$BP OLAT-6_3_0-RC01-20100104 OLAT-6_3_0-RC02-20010105 OLAT-6_3_0-RC03-20100107 OLAT-6_3_0-RC04-20100111 OLAT_6-3-0-RC05-20100112 OLAT_6-3-0-RC06-20100112 OLAT_6-3-0-RC07-20100113 OLAT_6-3-0-RC08-20100115 OLAT-6_3_0-RC09-20100115 OLAT-6_3_0-RC10-20100118 OLAT-6_3_0-RC11-20100118 OLAT-6_3_0-RC12-20100120 OLAT-6_3_0-RC13-20100120 OLAT-6_3_0-RC14-20100122 OLAT-6_3_0-RC15-20100126 OLAT-6_3_0-RC16-20100127 tmp-OLAT-HEAD-640-1 OLAT-6_3_0-RC17-20100128 OLAT-6_3_0-RC18-20100201 OLAT-6_3_0-RC19-20100202 OLAT-6_3_0-RC20-20100203 OLAT-6_3_0-RC21-20100205 OLAT-6_3_0-RC22-20100208 OLAT-6_3_0-RC23-20100209 OLAT-6_3_0-RC24-20100209 OLAT-6_3_x-PATCHES$BP Root_OLAT-6_4_0-BPS-Incubation OLAT-6_4_0-BPS-Incubation$BP OLAT-6_3_0-PUBLIC$BP OLAT-6_3_0-PUBLIC-RC01-20100309 OLAT-6_3_0-PUBLIC-RC02-20100310 OLAT-6_3_0-PUBLIC-RC03-20100311 OLAT-6_3_0-PUBLIC-RC04-20100315 OLAT-6_3_0-PUBLIC-RC05-20100315 OLAT-6_3_0-PUBLIC-RC06-20100316 OLAT-6_3_0-PUBLIC-20100317 OLAT-6_3_0-PUBLIC-20100323 OLAT-6_3_1-PUBLIC-20100330 Root_OLAT-HEAD-FRENTIX-4057-RESTAPI OLAT-HEAD-FRENTIX-4057-RESTAPI$BP OLAT_6_4_0-BPS-Onyx_Integration$BP Root_OLAT_6_4_0-BPS-Onyx_Integration OLAT-Reprio_7_0_0-MS02-20100528 OLAT-Reprio_7_0_0-MS02-20100604 OLAT-6_3_2-RC01-20100604 OLAT-6_3_2-RC02-20100609 OLAT-6_3_2-RC03-20100611 OLAT-6_3_2-RC04-20100611 OLAT-HEAD-FRENTIX-5494-EPORTFOLIO$BP Root_OLAT-HEAD-FRENTIX-5494-EPORTFOLIO OLAT-6_3_2-PUBLIC-20100618 OLAT-7_1-Backbutton$BP Root_OLAT-7_1-Backbutton OLAT-6_3_3-RC01-20100812 OLAT-6_3_3-RC02-20100812 CODE-REVIEW-7-0 OLAT-6_3_3-RC03-20100818 OLAT-6_3_3-RC04-20100823 before-commit-translations-20100901 mergeHeadTo5494 Root_OLAT-7_0_x-PUBLIC OLAT-7_0_x-PUBLIC$BP OLAT-7_0_0-PUBLIC-20100929 Root_OLAT_FRENTIX_5907_BACKUP_RESTORE OLAT_FRENTIX_5907_BACKUP_RESTORE$BP OLAT-6_3_3-before-OLAT-5954-Patch Root_OLAT-7_1_x-BRANCH OLAT-7_1_x-BRANCH$BP OLAT-7_1_0-RC01-20110207 CVS2HG_MIGRATION CVS2HG_MIGRATION_FORMATTED |
merge Head to branch, part1
| Author: | rhaag |
|---|---|
| Revision: | 1.1.120.1 |
| Changeset: | OLAT-HEAD_FRENTIX-3674:rhaag:20090112094340 |
| Date: | 10:43 12 January 2009 (3 years and 4 months) |