[moodle/el6/master: 2/2] Merge branch 'master' into el6
Jon Ciesla
limb at fedoraproject.org
Mon Apr 25 13:44:34 UTC 2011
commit de3c1d9ae2a510227d6cf7f78aa79606ed64230e
Merge: 7151ffe 69848dd
Author: Jon Ciesla <limb at jcomserv.net>
Date: Mon Apr 25 08:44:13 2011 -0500
Merge branch 'master' into el6
Conflicts:
.gitignore
.gitignore | 179 ++++---
langpack_dl.sh | 10 +
moodle.spec | 1724 ++++++--------------------------------------------------
sources | 178 ++++---
4 files changed, 389 insertions(+), 1702 deletions(-)
---
diff --cc .gitignore
index c4bc031,2cce0ab..107389e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,80 -1,258 +1,99 @@@
- moodle-weekly-19.tgz
- af_utf8.zip
- ar_utf8.zip
- be_utf8.zip
- bg_utf8.zip
- bs_utf8.zip
- ca_utf8.zip
- cs_utf8.zip
- cy_utf8.zip
- da_utf8.zip
- de_du_utf8.zip
- de_utf8.zip
- el_utf8.zip
- en_us_utf8.zip
- en_utf8.zip
- es_utf8.zip
- et_utf8.zip
- eu_utf8.zip
- fa_utf8.zip
- fil_utf8.zip
- fi_utf8.zip
- fr_ca_utf8.zip
- fr_utf8.zip
- ga_utf8.zip
- gl_utf8.zip
- gu_utf8.zip
- he_utf8.zip
- hi_utf8.zip
- hr_utf8.zip
- hu_utf8.zip
- hy_utf8.zip
- id_utf8.zip
- is_utf8.zip
- it_utf8.zip
- ja_utf8.zip
- ka_utf8.zip
- km_utf8.zip
- kn_utf8.zip
- ko_utf8.zip
- la_utf8.zip
- lo_utf8.zip
- lt_utf8.zip
- lv_utf8.zip
- mi_tn_utf8.zip
- mi_wwow_utf8.zip
- mk_utf8.zip
- ml_utf8.zip
- mn_utf8.zip
- ms_utf8.zip
- nl_utf8.zip
- nn_utf8.zip
- no_gr_utf8.zip
- no_utf8.zip
- pl_utf8.zip
- pt_br_utf8.zip
- pt_utf8.zip
- ro_utf8.zip
- ru_utf8.zip
- si_utf8.zip
- sk_utf8.zip
- sl_utf8.zip
- sm_utf8.zip
- so_utf8.zip
- sq_utf8.zip
- sr_cr_bo_utf8.zip
- sr_cr_utf8.zip
- sr_lt_utf8.zip
- sv_utf8.zip
- ta_lk_utf8.zip
- ta_utf8.zip
- th_utf8.zip
- tl_utf8.zip
- to_utf8.zip
- tr_utf8.zip
- uk_utf8.zip
- ur_utf8.zip
- uz_utf8.zip
- vi_utf8.zip
- zh_cn_utf8.zip
- zh_tw_utf8.zip
-moodle-1.9.9.tgz
-af_utf8.zip
-ar_utf8.zip
-be_utf8.zip
-bg_utf8.zip
-bs_utf8.zip
-ca_utf8.zip
-cs_utf8.zip
-cy_utf8.zip
-da_utf8.zip
-de_du_utf8.zip
-de_utf8.zip
-el_utf8.zip
-en_us_utf8.zip
-en_utf8.zip
-es_utf8.zip
-et_utf8.zip
-eu_utf8.zip
-fa_utf8.zip
-fil_utf8.zip
-fi_utf8.zip
-fr_ca_utf8.zip
-fr_utf8.zip
-ga_utf8.zip
-gl_utf8.zip
-gu_utf8.zip
-he_utf8.zip
-hi_utf8.zip
-hr_utf8.zip
-hu_utf8.zip
-hy_utf8.zip
-id_utf8.zip
-is_utf8.zip
-it_utf8.zip
-ja_utf8.zip
-ka_utf8.zip
-km_utf8.zip
-kn_utf8.zip
-ko_utf8.zip
-lo_utf8.zip
-lt_utf8.zip
-lv_utf8.zip
-mi_tn_utf8.zip
-mi_wwow_utf8.zip
-mk_utf8.zip
-ml_utf8.zip
-mn_utf8.zip
-ms_utf8.zip
-nl_utf8.zip
-nn_utf8.zip
-no_gr_utf8.zip
-no_utf8.zip
-pl_utf8.zip
-pt_br_utf8.zip
-pt_utf8.zip
-ro_utf8.zip
-ru_utf8.zip
-si_utf8.zip
-sk_utf8.zip
-sl_utf8.zip
-sm_utf8.zip
-so_utf8.zip
-sq_utf8.zip
-sr_cr_bo_utf8.zip
-sr_cr_utf8.zip
-sr_lt_utf8.zip
-sv_utf8.zip
-ta_lk_utf8.zip
-ta_utf8.zip
-th_utf8.zip
-tl_utf8.zip
-to_utf8.zip
-tr_utf8.zip
-uk_utf8.zip
-ur_utf8.zip
-uz_utf8.zip
-vi_utf8.zip
-zh_cn_utf8.zip
-zh_tw_utf8.zip
-/moodle-1.9.10.tgz
-/af_utf8.zip
-/ar_utf8.zip
-/be_utf8.zip
-/bg_utf8.zip
-/bs_utf8.zip
-/ca_utf8.zip
-/cs_utf8.zip
-/cy_utf8.zip
-/da_utf8.zip
-/de_du_utf8.zip
-/de_utf8.zip
-/el_utf8.zip
-/en_us_utf8.zip
-/en_utf8.zip
-/es_utf8.zip
-/et_utf8.zip
-/eu_utf8.zip
-/fa_utf8.zip
-/fil_utf8.zip
-/fi_utf8.zip
-/fr_ca_utf8.zip
-/fr_utf8.zip
-/ga_utf8.zip
-/gl_utf8.zip
-/gu_utf8.zip
-/he_utf8.zip
-/hi_utf8.zip
-/hr_utf8.zip
-/hu_utf8.zip
-/hy_utf8.zip
-/id_utf8.zip
-/is_utf8.zip
-/it_utf8.zip
-/ja_utf8.zip
-/ka_utf8.zip
-/km_utf8.zip
-/kn_utf8.zip
-/ko_utf8.zip
-/lo_utf8.zip
-/lt_utf8.zip
-/lv_utf8.zip
-/mi_tn_utf8.zip
-/mi_wwow_utf8.zip
-/mk_utf8.zip
-/ml_utf8.zip
-/mn_utf8.zip
-/ms_utf8.zip
-/nl_utf8.zip
-/nn_utf8.zip
-/no_gr_utf8.zip
-/no_utf8.zip
-/pl_utf8.zip
-/pt_br_utf8.zip
-/pt_utf8.zip
-/ro_utf8.zip
-/ru_utf8.zip
-/si_utf8.zip
-/sk_utf8.zip
-/sl_utf8.zip
-/sm_utf8.zip
-/so_utf8.zip
-/sq_utf8.zip
-/sr_cr_bo_utf8.zip
-/sr_cr_utf8.zip
-/sr_lt_utf8.zip
-/sv_utf8.zip
-/ta_lk_utf8.zip
-/ta_utf8.zip
-/th_utf8.zip
-/tl_utf8.zip
-/to_utf8.zip
-/tr_utf8.zip
-/uk_utf8.zip
-/ur_utf8.zip
-/uz_utf8.zip
-/vi_utf8.zip
-/zh_cn_utf8.zip
-/zh_tw_utf8.zip
-/moodle-1.9.11.tgz
+ /moodle-2.0.2.tgz
+ /af.zip
+ /am.zip
+ /ar.zip
+ /ast.zip
+ /az.zip
+ /be.zip
+ /bg.zip
+ /bn.zip
+ /bs.zip
+ /ca.zip
+ /ckb.zip
+ /cs.zip
+ /cy.zip
+ /da.zip
+ /de_du.zip
+ /de_kids.zip
+ /de.zip
+ /dv.zip
+ /el.zip
+ /en_us.zip
+ /en.zip
+ /es_ar.zip
+ /es_es.zip
+ /es_mx.zip
+ /es.zip
+ /et.zip
+ /eu.zip
+ /fa.zip
+ /fil.zip
+ /fi.zip
+ /fj.zip
+ /fr_ca.zip
+ /fr.zip
+ /ga.zip
+ /gd.zip
+ /gl.zip
+ /gu.zip
+ /he.zip
+ /hi.zip
+ /hr.zip
+ /hu.zip
+ /hy.zip
+ /id.zip
+ /is.zip
+ /it.zip
+ /ja.zip
+ /ka.zip
+ /kk.zip
+ /km.zip
+ /kn.zip
+ /ko.zip
+ /la.zip
+ /lo.zip
+ /lt.zip
+ /lv.zip
+ /mi_tn.zip
+ /mi_wwow.zip
+ /mk.zip
+ /ml.zip
+ /mn.zip
+ /mr.zip
+ /ms.zip
+ /nl.zip
+ /nn.zip
+ /no_gr.zip
+ /no.zip
+ /pl.zip
+ /pt_br.zip
+ /pt.zip
+ /ro.zip
+ /ru.zip
+ /si.zip
+ /sk.zip
+ /sl.zip
+ /sm.zip
+ /so.zip
+ /sq.zip
+ /sr_cr_bo.zip
+ /sr_cr.zip
+ /sr_lt.zip
+ /sr.zip
+ /sv.zip
+ /sw.zip
+ /ta_lk.zip
+ /ta.zip
+ /te.zip
+ /th.zip
+ /ti.zip
+ /tl.zip
+ /to.zip
+ /tr.zip
+ /uk.zip
+ /ur.zip
+ /uz.zip
+ /vi.zip
+ /zh_cn.zip
+ /zh_tw.zip
+ /zu.zip
More information about the scm-commits
mailing list